diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index a894814..b152136 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -13,20 +13,14 @@ blocks:
             - checkout
             - cd alpine
             - 'docker build --network=host -t catdeployed/postal:alpine .'
-    skip:
-      when: branch != 'master'
   - name: Build (Ubuntu)
-    skip:
-      when: branch != 'master'
     task:
       jobs:
         - name: 'Job #1'
           commands:
             - checkout
-            - cd alpine
-            - 'docker build --network=host -t catdeployed/postal:alpine .'
+            - cd ubuntu
+            - 'docker build --network=host -t catdeployed/postal:ubuntu .'
 promotions:
   - name: Default Promotion
-    pipeline_file: pipeline_2.yml
-    auto_promote:
-      when: branch = 'master' AND result = 'passed'
+    pipeline_file: tests.yml
diff --git a/.semaphore/pipeline_2.yml b/.semaphore/tests.yml
similarity index 57%
rename from .semaphore/pipeline_2.yml
rename to .semaphore/tests.yml
index 02bb410..1d181c3 100644
--- a/.semaphore/pipeline_2.yml
+++ b/.semaphore/tests.yml
@@ -13,3 +13,11 @@ blocks:
             - 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'
+          commands:
+            - cd ubuntu
+            - docker-compose up -d
+            - 'for i in {1..20}; do [ $(docker inspect postal | jq ''.[].State.Health.Status'') == "healthy" ] && break || sleep 15; done'