diff --git a/push-release b/push-release
index b80123cdf014f65819c7dccc66998da0318744fc_cHVzaC1yZWxlYXNl..bbb8e9d0dfa92b79e042c112893bfa81d5c5400b_cHVzaC1yZWxlYXNl 100755
--- a/push-release
+++ b/push-release
@@ -12,6 +12,9 @@
 
 OCTOBUS_BASE_IMAGE = 'octobus/heptapod'
 BASE_IMAGE = 'heptapod/heptapod'
+HEPTAPOD_REGISTRY_BASE_IMAGE = (
+    'registry.heptapod.net/heptapod/omnibus-heptapod'
+)
 GITLAB_RAILS = '/opt/gitlab/embedded/service/gitlab-rails/'
 
 
@@ -35,7 +38,7 @@
         self.extra_repos = extra_repos
 
     def docker_hub_base_image(self, base_image):
-        if self.podman:
+        if self.podman and len(base_image.split('/')) < 3:
             return 'docker.io/' + base_image
         return base_image
 
@@ -85,7 +88,7 @@
                  tag_series=None,
                  ):
         full_image_tags = []
-        for base_image in (BASE_IMAGE, ):
+        for base_image in (BASE_IMAGE, HEPTAPOD_REGISTRY_BASE_IMAGE):
             full_image_tags.append(
                 self.image_tag(label, stable_series=tag_series,
                                base_image=base_image)
@@ -101,7 +104,7 @@
         """Promote the x-y-testing image to 'latest'."""
         label = 'latest'
         full_image_tags = []
-        for base_image in (BASE_IMAGE, ):
+        for base_image in (BASE_IMAGE, HEPTAPOD_REGISTRY_BASE_IMAGE):
             full_image_tags.append(
                 self.image_tag(label, base_image=base_image)
             )