diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
new file mode 100644
index 0000000..8bca416
--- /dev/null
+++ b/.github/workflows/build-and-publish.yaml
@@ -0,0 +1,56 @@
+name: Image Build and Publish
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*.*.*'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            uselagoon/dbaas-controller
+            ghcr.io/uselagoon/dbaas-controller
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/config/crd/bases/crd.lagoon.sh_mongodbdproviders.yaml b/config/crd/bases/crd.lagoon.sh_mongodbdproviders.yaml
index fc307f0..aae00c2 100644
--- a/config/crd/bases/crd.lagoon.sh_mongodbdproviders.yaml
+++ b/config/crd/bases/crd.lagoon.sh_mongodbdproviders.yaml
@@ -4,20 +4,20 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: mongodbdproviders.crd.lagoon.sh
+  name: mongodbproviders.crd.lagoon.sh
 spec:
   group: crd.lagoon.sh
   names:
-    kind: MongoDBDProvider
-    listKind: MongoDBDProviderList
-    plural: mongodbdproviders
-    singular: mongodbdprovider
+    kind: MongoDBProvider
+    listKind: MongoDBProviderList
+    plural: mongodbproviders
+    singular: mongodbprovider
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: MongoDBDProvider is the Schema for the mongodbproviders API
+        description: MongoDBProvider is the Schema for the mongodbproviders API
         properties:
           apiVersion:
             description: |-