diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..45b1232
Binary files /dev/null and b/.DS_Store differ
diff --git a/.github/workflows/dhcp-testing.yml b/.github/workflows/dhcp-testing.yml
new file mode 100644
index 0000000..7564f38
--- /dev/null
+++ b/.github/workflows/dhcp-testing.yml
@@ -0,0 +1,41 @@
+on:
+  push
+
+jobs:
+  DhcpServerTesting:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: eu-west-2
+          role-to-assume: arn:aws:iam::683290208331:role/GitHubWorkflow
+          role-session-name: GitHubWorkflow
+
+      - name: Get AWS DockerHub credentials
+        id: docker_hub_credentials
+        run: |
+          username=$(aws ssm get-parameter --name /moj-network-access-control/docker/username --with-decryption --query "Parameter.Value" --output text)
+          echo "::add-mask::$username"
+          echo "docker-hub-username=$username" >> "$GITHUB_OUTPUT"
+          password=$(aws ssm get-parameter --name /moj-network-access-control/docker/password --with-decryption --query "Parameter.Value" --output text)
+          echo "::add-mask::$password"
+          echo "docker-hub-password=$password" >> "$GITHUB_OUTPUT"
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{steps.docker_hub_credentials.outputs.docker-hub-username}}
+          password: ${{steps.docker_hub_credentials.outputs.docker-hub-password}}
+
+      - name: Run DHCP tests
+        run: |
+          make build-dev
+          make test
diff --git a/buildspec.test.yml b/buildspec.test.yml
index 643ec46..15ca7c6 100644
--- a/buildspec.test.yml
+++ b/buildspec.test.yml
@@ -10,10 +10,6 @@ env:
     DOCKER_PASSWORD: "/moj-network-access-control/docker/password"
 
 phases:
-  install:
-    commands:
-      - nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
-      - timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
 
   build:
     commands: