diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index d9eae2525fb..f5043806f3c 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -51,7 +51,7 @@ jobs:
         uses: tesseract-robotics/colcon-action@v1
         with:
           ccache-prefix: ${{ matrix.distro }}
-          vcs-file: dependencies.repos
+          vcs-file: dependencies_focal.repos
           run-tests: false
           upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
           target-path: target_ws/src
diff --git a/.github/workflows/package_debian.yml b/.github/workflows/package_debian.yml
index 9b3d563d116..348d40c89b8 100644
--- a/.github/workflows/package_debian.yml
+++ b/.github/workflows/package_debian.yml
@@ -26,16 +26,18 @@ jobs:
         with:
           path: target_ws/src
 
-      - name: Install dependencies
-        run: |
-          apt update -q
-          apt install -q -y liboctomap-dev
+      - name: Install Depends
+              shell: bash
+              run: |
+                apt update
+                apt upgrade -y
+                apt install -y liboctomap-dev
 
       - name: Build and test
         uses: tesseract-robotics/colcon-action@v9
         with:
           ccache-enabled: false
-          vcs-file: dependencies.repos
+          vcs-file: ${{ matrix.distro == 'focal' && 'dependencies_focal.repos' || 'dependencies.repos' }}
           upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
           target-path: target_ws/src
           target-args: --cmake-args -DCMAKE_BUILD_TYPE=Release -DTESSERACT_PACKAGE=ON
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 0943825abbe..41289acf8af 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -47,7 +47,7 @@ jobs:
         uses: tesseract-robotics/colcon-action@v8
         with:
           ccache-prefix: ${{ matrix.distro }}
-          vcs-file: dependencies.repos
+          vcs-file: ${{ matrix.distro == 'focal' && 'dependencies_focal.repos' || 'dependencies.repos' }}
           upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
           target-path: target_ws/src
           target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON -DTESSERACT_PACKAGE=ON
diff --git a/dependencies.repos b/dependencies.repos
index ba6a1b42f91..18f96d6680f 100644
--- a/dependencies.repos
+++ b/dependencies.repos
@@ -6,10 +6,6 @@
     local-name: opw_kinematics
     uri: https://github.com/Jmeyer1292/opw_kinematics.git
     version: 0.5.2
-- git:
-    local-name: fcl
-    uri: https://github.com/flexible-collision-library/fcl.git
-    version: 0.6.1
 - git:
     local-name: octomap
     uri: https://github.com/OctoMap/octomap.git
diff --git a/dependencies_focal.repos b/dependencies_focal.repos
new file mode 100644
index 00000000000..ba6a1b42f91
--- /dev/null
+++ b/dependencies_focal.repos
@@ -0,0 +1,16 @@
+- git:
+    local-name: ros_industrial_cmake_boilerplate
+    uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
+    version: 0.7.1
+- git:
+    local-name: opw_kinematics
+    uri: https://github.com/Jmeyer1292/opw_kinematics.git
+    version: 0.5.2
+- git:
+    local-name: fcl
+    uri: https://github.com/flexible-collision-library/fcl.git
+    version: 0.6.1
+- git:
+    local-name: octomap
+    uri: https://github.com/OctoMap/octomap.git
+    version: v1.9.8
diff --git a/tesseract_collision/fcl/CMakeLists.txt b/tesseract_collision/fcl/CMakeLists.txt
index 1b5fcbe0a17..c52640147e3 100644
--- a/tesseract_collision/fcl/CMakeLists.txt
+++ b/tesseract_collision/fcl/CMakeLists.txt
@@ -75,8 +75,6 @@ if(TESSERACT_PACKAGE)
     VERSION ${pkg_extracted_version}
     DESCRIPTION "Tesseract Collision FCL components"
     COMPONENT_DEPENDS core
-    LINUX_DEPENDS "libfcl-dev (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl"
-                  "fcl (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl"
-    WINDOWS_DEPENDS "libfcl-dev (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl"
-                    "fcl (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl")
+    LINUX_DEPENDS "libfcl-dev (>= 0.6.0) | fcl (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl"
+    WINDOWS_DEPENDS "libfcl-dev (>= 0.6.0) | fcl (>= 0.6.0) | ${TESSERACT_PACKAGE_PREFIX}fcl")
 endif()
diff --git a/tesseract_geometry/package.xml b/tesseract_geometry/package.xml
index 59e34992c6f..1b4ae636828 100644
--- a/tesseract_geometry/package.xml
+++ b/tesseract_geometry/package.xml
@@ -17,7 +17,7 @@
   <build_depend>eigen</build_depend>
   <build_export_depend>eigen</build_export_depend>
   <depend>libconsole-bridge-dev</depend>
-  <depend>octomap</depend>
+  <depend>liboctomap-dev</depend>
 
   <test_depend>gtest</test_depend>
   <test_depend>tesseract_support</test_depend>