diff --git a/podctl/visitors/commit.py b/podctl/visitors/commit.py
index 6d2e1aa..7a879b9 100644
--- a/podctl/visitors/commit.py
+++ b/podctl/visitors/commit.py
@@ -43,12 +43,6 @@ class Commit:
         self.tags = [t for t in self.tags if t is not None]
 
     def post_build(self, script):
-        user = os.getenv('DOCKER_USER')
-        passwd = os.getenv('DOCKER_PASS')
-        if user and passwd and os.getenv('CI') and self.registry:
-            subprocess.check_call([
-                'podman', 'login', '-u', user, '-p', passwd, self.registry])
-
         script.append(f'''
             umounts
             buildah commit --format={self.format} $ctr {self.repo}
@@ -58,5 +52,14 @@ class Commit:
             script.append(f'buildah tag {self.repo} ' + ' '.join(self.tags))
 
             if self.push:
+                user = os.getenv('DOCKER_USER')
+                passwd = os.getenv('DOCKER_PASS')
+                if user and passwd and os.getenv('CI') and self.registry:
+                    subprocess.check_call([
+                        'podman', 'login',
+                        '-u', user, '-p', passwd,
+                        self.registry
+                    ])
+
                 for tag in self.tags:
                     script.append(f'podman push {self.repo}:{tag}')
diff --git a/tests/test_build.py b/tests/test_build.py
index d7f5210..4bc3813 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -17,6 +17,7 @@ from podctl.visitors import packages
 packages.subprocess.check_call = mock.Mock()
 
 os.environ['CACHE_DIR'] = '/test'
+os.environ['CI'] = '1'
 
 
 def script_test(name, *visitors):