diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index c25edb6..549e857 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -12,15 +12,15 @@ blocks:
           commands:
             - checkout
             - cd alpine
-            - docker build --network=host -t docker.pkg.github.com/catdeployed/docker-postal/postal:alpine .
-            - docker save -o postal-alpine-container.tar docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
+            - docker build --network=host -t catdeployed/postal:alpine .
+            - docker save -o postal-alpine-container.tar catdeployed/postal:alpine
             - artifact push workflow postal-alpine-container.tar --expire-in 1d
         - name: 'Ubuntu'
           commands:
             - checkout
             - cd ubuntu
-            - docker build --network=host -t docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu .
-            - docker save -o postal-ubuntu-container.tar docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
+            - docker build --network=host -t catdeployed/postal:ubuntu .
+            - docker save -o postal-ubuntu-container.tar catdeployed/postal:ubuntu
             - artifact push workflow postal-ubuntu-container.tar --expire-in 1d
 promotions:
   - name: Docker Image Testing
diff --git a/.semaphore/upload-dummy.yml b/.semaphore/upload-dummy.yml
index d6fd0b4..5a7faa0 100644
--- a/.semaphore/upload-dummy.yml
+++ b/.semaphore/upload-dummy.yml
@@ -4,10 +4,6 @@ agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu1804
-global_job_config:
-  secrets:
-    - name: DOCKER_GITHUB
-    - name: DOCKER_HUB
 blocks:
   - name: Upload
     task:
diff --git a/.semaphore/upload-production.yml b/.semaphore/upload-production.yml
index 600414f..a25dcb0 100644
--- a/.semaphore/upload-production.yml
+++ b/.semaphore/upload-production.yml
@@ -6,8 +6,7 @@ agent:
     os_image: ubuntu1804
 global_job_config:
   secrets:
-    - name: DOCKER_GITHUB
-    - name: DOCKER_HUB
+    - name: DOCKER_HUB_CATDEPLOYED
 blocks:
   - name: Upload
     task:
@@ -18,13 +17,8 @@ blocks:
             - cd alpine
             - artifact pull workflow postal-alpine-container.tar
             - docker load -i postal-alpine-container.tar
-            - echo "$DOCKER_GITHUB_PASS" | docker login docker.pkg.github.com --username "$DOCKER_GITHUB_USER" --password-stdin
-            - docker tag docker.pkg.github.com/catdeployed/docker-postal/postal:alpine docker.pkg.github.com/catdeployed/docker-postal/postal:latest
-            - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
-            - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:latest
-            - echo "$DOCKER_HUB_PASS" | docker login --username "$DOCKER_HUB_USER" --password-stdin
-            - docker tag docker.pkg.github.com/catdeployed/docker-postal/postal:alpine catdeployed/postal:alpine
-            - docker tag docker.pkg.github.com/catdeployed/docker-postal/postal:alpine catdeployed/postal:latest
+            - echo "$DOCKER_HUB_CATDEPLOYED_PASS" | docker login --username "$DOCKER_HUB_CATDEPLOYED_USER" --password-stdin
+            - docker tag catdeployed/postal:alpine catdeployed/postal:latest
             - docker push catdeployed/postal:alpine
             - docker push catdeployed/postal:latest
             - artifact yank workflow postal-alpine-container.tar
@@ -34,9 +28,6 @@ blocks:
             - cd ubuntu
             - artifact pull workflow postal-ubuntu-container.tar
             - docker load -i postal-ubuntu-container.tar
-            - echo "$DOCKER_GITHUB_PASS" | docker login docker.pkg.github.com --username "$DOCKER_GITHUB_USER" --password-stdin
-            - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
-            - echo "$DOCKER_HUB_PASS" | docker login --username "$DOCKER_HUB_USER" --password-stdin
-            - docker tag docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu catdeployed/postal:ubuntu
+            - echo "$DOCKER_HUB_CATDEPLOYED_PASS" | docker login --username "$DOCKER_HUB_CATDEPLOYED_USER" --password-stdin
             - docker push catdeployed/postal:ubuntu
             - artifact yank workflow postal-ubuntu-container.tar
diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml
index 0c806b6..f06a614 100644
--- a/alpine/docker-compose.yml
+++ b/alpine/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   postal:
-    image: docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
+    image: catdeployed/postal:alpine
     container_name: postal
     command: run
     ports:
diff --git a/ubuntu/docker-compose.yml b/ubuntu/docker-compose.yml
index a026604..68edd15 100644
--- a/ubuntu/docker-compose.yml
+++ b/ubuntu/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   postal:
-    image: docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
+    image: catdeployed/postal:ubuntu
     container_name: postal
     command: run
     tty: true