diff --git a/.gitmodules b/.gitmodules
index 04d16d31093..e69de29bb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/go/src/github.com/cloudfoundry/bosh-agent"]
-	path = src/go/src/github.com/cloudfoundry/bosh-agent
-	url = https://github.com/cloudfoundry/bosh-agent.git
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index a7207b4aed1..d8ba6ede5eb 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -166,6 +166,8 @@ jobs:
           trigger: true
         - get: bosh-cli
           trigger: true
+        - get: bosh-agent
+          trigger: true
       - aggregate:
         - task: test-group-1
           privileged: true
@@ -217,6 +219,8 @@ jobs:
           trigger: true
         - get: bosh-cli
           trigger: true
+        - get: bosh-agent
+          trigger: true
       - aggregate:
         - task: test-group-1
           privileged: true
@@ -261,6 +265,7 @@ jobs:
     build_logs_to_retain: 250
     plan:
       - { get: bosh-src, trigger: true }
+      - { get: bosh-agent, trigger: true }
       - aggregate:
         - task: test-group-1
           privileged: true
@@ -309,6 +314,8 @@ jobs:
           trigger: true
         - get: bosh-cli
           trigger: true
+        - get: bosh-agent
+          trigger: true
       - aggregate:
         - task: upgrade-with-postgres
           privileged: true
@@ -693,3 +700,10 @@ resources:
     type: bosh-io-release
     source:
       repository: cloudfoundry-incubator/bosh-vsphere-cpi-release
+
+  - name: bosh-agent
+    type: git
+    source:
+      uri: https://github.com/cloudfoundry/bosh-agent
+      branch: master
+
diff --git a/ci/tasks/test-integration-gocli.sh b/ci/tasks/test-integration-gocli.sh
index 4baf9ab61e7..56065c51614 100755
--- a/ci/tasks/test-integration-gocli.sh
+++ b/ci/tasks/test-integration-gocli.sh
@@ -46,6 +46,10 @@ chmod +x /usr/local/bin/gobosh
 source /etc/profile.d/chruby.sh
 chruby $RUBY_VERSION
 
+agent_path=bosh-src/go/src/github.com/cloudfoundry/
+mkdir -p $agent_path
+cp -r bosh-agent $agent_path
+
 cd bosh-src/src
 
 print_git_state
diff --git a/ci/tasks/test-integration-gocli.yml b/ci/tasks/test-integration-gocli.yml
index dd104a7dc0a..4feff47fecf 100644
--- a/ci/tasks/test-integration-gocli.yml
+++ b/ci/tasks/test-integration-gocli.yml
@@ -9,6 +9,7 @@ image_resource:
 inputs:
 - name: bosh-src
 - name: bosh-cli
+- name: bosh-agent
 
 run:
   path: bosh-src/ci/tasks/test-integration-gocli.sh
diff --git a/ci/tasks/test-integration.sh b/ci/tasks/test-integration.sh
index f49d74ac493..c698d0b2bd1 100755
--- a/ci/tasks/test-integration.sh
+++ b/ci/tasks/test-integration.sh
@@ -43,6 +43,10 @@ esac
 source /etc/profile.d/chruby.sh
 chruby $RUBY_VERSION
 
+agent_path=bosh-src/go/src/github.com/cloudfoundry/
+mkdir -p $agent_path
+cp -r bosh-agent $agent_path
+
 cd bosh-src/src
 
 print_git_state
diff --git a/ci/tasks/test-integration.yml b/ci/tasks/test-integration.yml
index cbedb3af829..32b7f97cce9 100644
--- a/ci/tasks/test-integration.yml
+++ b/ci/tasks/test-integration.yml
@@ -8,6 +8,7 @@ image_resource:
 
 inputs:
 - name: bosh-src
+- name: bosh-agent
 
 run:
   path: bosh-src/ci/tasks/test-integration.sh
diff --git a/ci/tasks/test-upgrade.sh b/ci/tasks/test-upgrade.sh
index 52092593572..00c717b230d 100755
--- a/ci/tasks/test-upgrade.sh
+++ b/ci/tasks/test-upgrade.sh
@@ -46,6 +46,10 @@ chmod +x /usr/local/bin/gobosh
 source /etc/profile.d/chruby.sh
 chruby $RUBY_VERSION
 
+agent_path=bosh-src/go/src/github.com/cloudfoundry/
+mkdir -p $agent_path
+cp -r bosh-agent $agent_path
+
 cd bosh-src/src
 
 print_git_state
diff --git a/ci/tasks/test-upgrade.yml b/ci/tasks/test-upgrade.yml
index eed250e90dd..46b163a9922 100644
--- a/ci/tasks/test-upgrade.yml
+++ b/ci/tasks/test-upgrade.yml
@@ -9,6 +9,7 @@ image_resource:
 inputs:
 - name: bosh-src
 - name: bosh-cli
+- name: bosh-agent
 
 run:
   path: bosh-src/ci/tasks/test-upgrade.sh
diff --git a/src/go/src/github.com/cloudfoundry/bosh-agent b/src/go/src/github.com/cloudfoundry/bosh-agent
deleted file mode 160000
index 0a7cfe908b9..00000000000
--- a/src/go/src/github.com/cloudfoundry/bosh-agent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0a7cfe908b9fab3cd8d4fbf2a3fa401fce23a2df