diff --git a/.github/workflows/dockerhubES.yml b/.github/workflows/dockerhubES.yml
index 39fd7a04..79fde982 100644
--- a/.github/workflows/dockerhubES.yml
+++ b/.github/workflows/dockerhubES.yml
@@ -3,13 +3,13 @@ name: Create and publish Elastic Search Docker image to Docker hub
 on:
   push:
     branches:
-      - "master"
+      - "main"
   release:
   workflow_dispatch:
 
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: intrahealth/elasticsearch
+  IMAGE_NAME: uwdigi/elasticsearch-opencr
 
 jobs:
   build-and-push-es-image:
@@ -20,13 +20,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to the Docker registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata for Docker
         id: meta
diff --git a/.github/workflows/dockerhubopencr.yml b/.github/workflows/dockerhubopencr.yml
index 4e4ff5ea..2c639c41 100644
--- a/.github/workflows/dockerhubopencr.yml
+++ b/.github/workflows/dockerhubopencr.yml
@@ -3,13 +3,13 @@ name: Create and publish OpencCR Docker image to Docker hub
 on:
   push:
     branches:
-      - "master"
+      - "main"
   release:
   workflow_dispatch:
 
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: intrahealth/opencr
+  IMAGE_NAME: uwdigi/opencr
 
 jobs:
   build-and-push-opencr-image:
@@ -20,28 +20,28 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to the Docker registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch,pattern=main,latest=true
-            type=ref,event=tag
-            type=sha
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
         with:
           context: ./docker/opencr
           push: true
+          load: false
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{github.repository}}:latest
+          cache-to: type=inline
\ No newline at end of file
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 66eb8d11..cbb39e92 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,10 +1,10 @@
 name: docs
 
 on:
-  push:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ef364967..d5edf47d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,9 +1,9 @@
 name: e2e
 on:
-  push:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/hapilatest.yml b/.github/workflows/hapilatest.yml
index ce3003d9..2ea51ba1 100644
--- a/.github/workflows/hapilatest.yml
+++ b/.github/workflows/hapilatest.yml
@@ -1,10 +1,10 @@
 name: hapilatest
 
 on:
-  push:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/loginpage.yml b/.github/workflows/loginpage.yml
index b461b83c..eb206380 100644
--- a/.github/workflows/loginpage.yml
+++ b/.github/workflows/loginpage.yml
@@ -1,14 +1,14 @@
 name: loginpage
 
 on:
-  push:
-    branches:
-      - master
-      - main
-  pull_request:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
+  # pull_request:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index f94963ab..e9635fae 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -1,14 +1,14 @@
 name: build
 
 on:
-  push:
-    branches:
-      - master
-      - main
-  pull_request:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
+  # pull_request:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bd09237d..bf7fd8cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,14 +1,14 @@
 name: test
 
 on:
-  push:
-    branches:
-      - master
-      - main
-  pull_request:
-    branches:
-      - master
-      - main
+  # push:
+  #   branches:
+  #     - master
+  #     - main
+  # pull_request:
+  #   branches:
+  #     - master
+  #     - main
   workflow_dispatch:
 
 jobs:
diff --git a/server/package.json b/server/package.json
index e4974715..7b8706ca 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client-registry",
-  "version": "1.0.0",
+  "version": "4.0.5",
   "description": "Client Registry",
   "main": "app.js",
   "scripts": {