diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9830cdc5ffd586b7c45766b6208053af8d2779cd..7534fbf59932b7c4a9c46311e67a0e204f0c18c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ stages:
 
 workflow:
     rules:
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)-wip/
+          when: never
         - if: '$CI_PIPELINE_SOURCE == "push"'
 
 image: docker:19.03.12
@@ -15,10 +17,20 @@ services:
     - name: docker:19.03.12-dind
 
 before_script:
-    - docker info
     - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
 
-build dev:
+build dev workflow:
     stage: build-dev
     script:
-        - docker build -t workspace:gitlab-test -f services/workflow/Dockerfile.dev .
+        - docker build -t marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH -f services/workflow/Dockerfile.dev .
+        - docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH
+
+build dev capability:
+    stage: build-dev
+    script:
+        - docker build -t marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH -f services/capability/Dockerfile.dev .
+        - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH