diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 68e6aa45f..19df4da4f 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -42,12 +42,12 @@ jobs:
 
       - name: Pull Deployer image
         run: |
-          docker pull newrelic/deployer:latest
-          docker images newrelic/deployer:latest
+          docker pull ghcr.io/newrelic/deployer:latest
+          docker images ghcr.io/newrelic/deployer:latest
 
       - name: Teardown all resources
         run: |
           docker run -i\
             -v ${{ github.workspace }}/configs/:/mnt/deployer/configs/\
             -v ${{ github.workspace }}/test/:/mnt/deployer/test/\
-            --entrypoint ruby newrelic/deployer:latest batch.rb -c configs/$config_name -d $path -s 20 -m teardown
+            --entrypoint ruby ghcr.io/newrelic/deployer:latest batch.rb -c configs/$config_name -d $path -s 20 -m teardown
diff --git a/.github/workflows/nonregression.yml b/.github/workflows/nonregression.yml
index 53a8eb341..cc00cfdd3 100644
--- a/.github/workflows/nonregression.yml
+++ b/.github/workflows/nonregression.yml
@@ -165,8 +165,8 @@ jobs:
 
       - name: Pull Deployer image
         run: |
-          docker pull newrelic/deployer:latest
-          docker images newrelic/deployer:latest
+          docker pull ghcr.io/newrelic/deployer:latest
+          docker images ghcr.io/newrelic/deployer:latest
 
       - name: Run deployer
         id: deployerRun
@@ -177,7 +177,7 @@ jobs:
           docker run -i\
             -v ${{ github.workspace }}/configs/:/mnt/deployer/configs/\
             -v ${{ github.workspace }}/test/:/mnt/deployer/test/\
-            --entrypoint ruby newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -l debug
+            --entrypoint ruby  ghcr.io/newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -l debug
           echo ::set-output name=exit_status::$?
       - name: Teardown any previous deployment
         if: always()
@@ -189,7 +189,7 @@ jobs:
           docker run \
             -v ${{ github.workspace }}/configs/:/mnt/deployer/configs/\
             -v ${{ github.workspace }}/test/:/mnt/deployer/test/\
-            --entrypoint ruby newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -t
+            --entrypoint ruby ghcr.io/newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -t
 
       - name: Report any error
         if: steps.deployerRun.outputs.exit_status != 0
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 3d3189561..468d5ef6e 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -258,8 +258,8 @@ jobs:
 
       - name: Pull Deployer image
         run: |
-          docker pull newrelic/deployer:latest
-          docker images newrelic/deployer:latest
+          docker pull ghcr.io/newrelic/deployer:latest
+          docker images ghcr.io/newrelic/deployer:latest
 
       - name: Run deployer
         id: deployerRun
@@ -271,7 +271,7 @@ jobs:
           docker run \
             -v ${{ github.workspace }}/configs/:/mnt/deployer/configs/\
             -v ${{ github.workspace }}/test/:/mnt/deployer/test/\
-            --entrypoint ruby newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -l debug
+            --entrypoint ruby ghcr.io/newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -l debug
           echo ::set-output name=exit_status::$?
 
       - name: Teardown any previous deployment
@@ -284,7 +284,7 @@ jobs:
           docker run \
             -v ${{ github.workspace }}/configs/:/mnt/deployer/configs/\
             -v ${{ github.workspace }}/test/:/mnt/deployer/test/\
-            --entrypoint ruby newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -t
+            --entrypoint ruby ghcr.io/newrelic/deployer:latest main.rb -c configs/gitusdkr${{ github.run_id }}.json -d $testDefinitionFile -t
 
       - name: Report any error
         if: steps.deployerRun.outputs.exit_status != 0
diff --git a/test/definitions/agent-control/debians/ubuntu16-agent-control.json b/test/definitions/agent-control/debians/ubuntu16-agent-control.json
index f18aad7ef..361e7013d 100644
--- a/test/definitions/agent-control/debians/ubuntu16-agent-control.json
+++ b/test/definitions/agent-control/debians/ubuntu16-agent-control.json
@@ -27,7 +27,8 @@
           "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
           "validate_output": "Agent Control\\s+\\(installed\\)",
           "recipe_targeted": "agent-control",
-          "use_organization_id": true
+          "use_organization_id": true,
+          "newrelic_organization_id": "2a65a260-7908-45ce-b7dd-1eb99b8e470f"
         }
       }
     ]