diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f226661ccc3fdb9e3020f9201f5a7dcafdd424f8..9852f01c40b0a042d3e035d4226d048525afd5ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,8 @@
 image: docker:latest
 
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
 services:
   - docker:dind
 
@@ -103,6 +106,24 @@ build-debian-jessie-build-dev:
   except:
     - master
 
+# Debian WP.org Plugin deploy builds
+build-debian-wp-org-deploy-build-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:wp-org-deploy" ./debian/wp-org-deploy/context
+    - docker push "$CI_REGISTRY_IMAGE/debian:wp-org-deploy"
+  only:
+    - master
+  when: manual
+
+build-debian-wp-org-deploy-build-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:wp-org-deploy-dev" ./debian/wp-org-deploy/context
+    - docker push "$CI_REGISTRY_IMAGE/debian:wp-org-deploy-dev"
+  except:
+    - master
+
 # PHP 7.3
 build-php-7.3-master:
   stage: deploy
diff --git a/.gitmodules b/.gitmodules
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b958761f6a2d8d5e43878c1f882a933628db76b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "debian/wp-org-deploy"]
+	path = debian/wp-org-deploy
+	url = git@git.ethitter.com:docker/wp-org-plugin-deploy.git
diff --git a/debian/wp-org-deploy b/debian/wp-org-deploy
new file mode 160000
index 0000000000000000000000000000000000000000..9d5724b2bae0d948f12a00ab273949d3f003065f
--- /dev/null
+++ b/debian/wp-org-deploy
@@ -0,0 +1 @@
+Subproject commit 9d5724b2bae0d948f12a00ab273949d3f003065f