diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 9bfc578..418f129 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -5,18 +5,15 @@ agent:
     type: e1-standard-2
     os_image: ubuntu1804
 blocks:
-  - name: Build (Alpine)
+  - name: Build
     task:
       jobs:
-        - name: 'Job #1'
+        - name: 'Alpine'
           commands:
             - checkout
             - cd alpine
             - 'docker build --network=host -t catdeployed/postal:alpine .'
-  - name: Build (Ubuntu)
-    task:
-      jobs:
-        - name: 'Job #1'
+        - name: 'Ubuntu'
           commands:
             - checkout
             - cd ubuntu
diff --git a/.semaphore/tests.yml b/.semaphore/tests.yml
index 260ca57..5109db3 100644
--- a/.semaphore/tests.yml
+++ b/.semaphore/tests.yml
@@ -5,19 +5,16 @@ agent:
     type: e1-standard-2
     os_image: ubuntu1804
 blocks:
-  - name: Test (Alpine)
+  - name: Test
     task:
       jobs:
-        - name: 'Job #1'
+        - name: 'Alpine Test'
           commands:
             - checkout
             - cd alpine
             - docker-compose up -d
             - 'for i in {1..20}; do [ $(docker inspect postal | jq ''.[].State.Health.Status'') == "healthy" ] && break || sleep 15; done'
-  - name: Test (Ubuntu)
-    task:
-      jobs:
-        - name: 'Job #1'
+        - name: 'Ubuntu Test'
           commands:
             - checkout
             - cd ubuntu
diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml
index 7178b4c..f06a614 100644
--- a/alpine/docker-compose.yml
+++ b/alpine/docker-compose.yml
@@ -1,8 +1,7 @@
 version: "3"
 services:
   postal:
-    #image: catdeployed/postal:alpine
-    build: .
+    image: catdeployed/postal:alpine
     container_name: postal
     command: run
     ports:
diff --git a/ubuntu/docker-compose.yml b/ubuntu/docker-compose.yml
index d6c4c33..68edd15 100644
--- a/ubuntu/docker-compose.yml
+++ b/ubuntu/docker-compose.yml
@@ -1,8 +1,7 @@
 version: "3"
 services:
   postal:
-    #image: catdeployed/postal:ubuntu
-    build: .
+    image: catdeployed/postal:ubuntu
     container_name: postal
     command: run
     tty: true