diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
new file mode 100644
index 00000000..c0e41e3b
--- /dev/null
+++ b/.github/workflows/build-docker-image.yml
@@ -0,0 +1,49 @@
+# from https://docs.github.com/en/actions/guides/publishing-docker-images
+
+name: Build and Push Image
+on:
+  push:
+    branches:
+      - 'main'
+    # tags:
+    #   - 'v*.*.*'
+  pull_request:  
+    branches:
+      - 'main'
+
+env:
+  REGISTRY: hub.docker.com
+  IMAGE_NAME: brownccv/icesat2waves
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          username: ccvbot
+          password: ${{ secrets.CCVBOT_DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/run-tests-container.yml b/.github/workflows/run-tests-container.yml
new file mode 100644
index 00000000..3294071d
--- /dev/null
+++ b/.github/workflows/run-tests-container.yml
@@ -0,0 +1,24 @@
+name: Run Tests with Container
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    container:
+        image: docker://brownccv/icesat2waves:main
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Run Tests
+        run: |
+          docker run --volume="${{ github.workspace }}:/app" \
+                     --workdir="/app" \
+                     docker://brownccv/icesat2waves:main \
+                     pytest tests
\ No newline at end of file