diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 00000000..a48ca2f9
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,43 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - master
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ohmyform/ohmyform
+          tags: |
+            type=raw,value=latest
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a6516b7..1dc9b3c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - heroku deployments
 - fix problem with node-prune on production build
 - variable names in examples (https://github.com/ohmyform/ohmyform/issues/134)
+- error if /run/nginx already exists (https://github.com/ohmyform/ohmyform/pull/148)
 
 ### Security
 
diff --git a/api b/api
index 6c0181c0..4f665f6d 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 6c0181c09dff9af786195c811b8bf57063f8223e
+Subproject commit 4f665f6d4b52634ec0e3ca4d8bc6c479ec82c51f
diff --git a/ui b/ui
index e54da2b1..1f0926c9 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit e54da2b1110ebda0f1dd5997adf2ebeeb3bd4da9
+Subproject commit 1f0926c904d4aae5bec437c19aed7bf97e9ebe6e