diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 6daa9b4..6f5dd6f 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Run benchmark
       shell: bash
       run: |
-        source /opt/ros/melodic/setup.bash
+        source /opt/ros/noetic/setup.bash
         source ws/devel/setup.bash
         ./ws/devel/lib/trochoids/trochoids-benchmark --benchmark_format=json | tee benchmark_result.json
         git config --global user.name "Github Action"
@@ -76,7 +76,7 @@ jobs:
     - name: Run unit tests
       shell: bash
       run: |
-        source /opt/ros/melodic/setup.bash
+        source /opt/ros/noetic/setup.bash
         source ws/devel/setup.bash
         ./ws/devel/lib/trochoids/trochoids-test
 
@@ -118,7 +118,7 @@ jobs:
 #     - name: Run benchmark
 #       shell: bash
 #       run: |
-#         source /opt/ros/melodic/setup.bash
+#         source /opt/ros/noetic/setup.bash
 #         source ws/devel/setup.bash
 #         roscore &
 #         sleep 3
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index d45b743..dfae256 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ros:melodic
+FROM ros:noetic
 
 WORKDIR /ws/src