diff --git a/.github/workflows/publish-keripy.yml b/.github/workflows/publish-keripy.yml
new file mode 100644
index 000000000..c1335fea0
--- /dev/null
+++ b/.github/workflows/publish-keripy.yml
@@ -0,0 +1,43 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+
+name: Publish Docker image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - 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: gleif/keri
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          file: images/keripy.dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0fea1fd23..2d82bffb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,8 @@
-.PHONY: interop-bob
-interop-bob:
-	@docker run --rm -i -p 5620-5621 --name keripy-bob ghcr.io/m00sey/keripy/keripy-interop  bash -c 'python -m keri.demo.demo_bob -e 10'
-
-.PHONY: interop-eve
-interop-eve:
-	@docker run --rm -i -p 5620-5621 --name keripy-eve ghcr.io/m00sey/keripy/keripy-interop  bash -c 'python -m keri.demo.demo_eve -e 10'
-
-.PHONY: interop-sam
-interop-sam:
-	@docker run --rm -i -p 5620-5621 --name keripy-sam ghcr.io/WebOfTrust/keripy/keripy-interop  bash -c 'python -m keri.demo.demo_sam -e 10'
 
 .PHONY: build-keri
 build-keri:
-	@docker build --no-cache -f Dockerfile --tag gleif/keri:0.6.7 .
+	@docker build --no-cache -f images/keripy.dockerfile --tag gleif/keri:0.6.8 .
+
+.PHONY: build-witness-demo
+build-witness-demo:
+	@docker build --no-cache -f images/witness.demo.dockerfile --tag gleif/keri-witness-demo:0.6.8 .
diff --git a/Dockerfile b/images/keripy.dockerfile
similarity index 96%
rename from Dockerfile
rename to images/keripy.dockerfile
index f23c456be..eb435aa60 100644
--- a/Dockerfile
+++ b/images/keripy.dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
 # Setup Rust for blake3 dependency build
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 
-COPY ./ /keripy
+COPY .. /keripy
 WORKDIR /keripy
 
 # Install KERIpy dependencies