diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 27e0233602..545de07471 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -11,7 +11,7 @@ pipeline {
           def docker_images = [
             armhf: "px4io/px4-dev-armhf:2020-04-01",
             base: "px4io/px4-dev-base-bionic:2020-04-01",
-            nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-01",
+            nuttx: "px4io/px4-dev-nuttx-focal:2020-09-14",
             snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
           ]
 
@@ -108,7 +108,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+    //     docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
     //   }
     //   options {
     //         skipDefaultCheckout()
diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware
index 645a50ab21..8dbc57c7cf 100644
--- a/.ci/Jenkinsfile-hardware
+++ b/.ci/Jenkinsfile-hardware
@@ -12,7 +12,7 @@ pipeline {
             stage("build px4_fmu-v2_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -80,7 +80,7 @@ pipeline {
             stage("build px4_fmu-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -154,7 +154,7 @@ pipeline {
             stage("build px4_fmu-v4_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -227,7 +227,7 @@ pipeline {
             stage("build px4_fmu-v4pro_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -301,7 +301,7 @@ pipeline {
             stage("build px4_fmu-v5_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -376,7 +376,7 @@ pipeline {
             stage("build px4_fmu-v5_debug") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -451,7 +451,7 @@ pipeline {
             stage("build px4_fmu-v5_optimized") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -524,7 +524,7 @@ pipeline {
             stage("build px4_fmu-v5_stackcheck") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -599,7 +599,7 @@ pipeline {
             stage("build modalai_fc-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -672,7 +672,7 @@ pipeline {
             stage("build holybro_durandal-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -751,7 +751,7 @@ pipeline {
             stage("build nxp_fmuk66-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 86cd1d963c..e0c1341bd3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
 {
 	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-bionic:2020-04-01",
+	"image": "px4io/px4-dev-nuttx-focal:2020-09-14",
 
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
 
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 24afe5e3a7..0b7a44c57d 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -26,11 +26,7 @@ jobs:
           "module_documentation",
           "parameters_metadata",
         ]
-        ubuntu_release: [
-          #bionic,
-          focal
-          ]
-    container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-08-14
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml
index 5ba8ca66f2..62bca3003f 100644
--- a/.github/workflows/compile_nuttx.yml
+++ b/.github/workflows/compile_nuttx.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-bionic:2020-08-14
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 3f28d26b5e..f8f75fc630 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml
index aa76a6eb7a..0a2e3c3e38 100644
--- a/.github/workflows/metadata.yml
+++ b/.github/workflows/metadata.yml
@@ -12,7 +12,7 @@ jobs:
 
   airframe:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -27,7 +27,7 @@ jobs:
 
   module:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -42,7 +42,7 @@ jobs:
 
   parameter:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -57,7 +57,7 @@ jobs:
 
   uorb_graph:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2020-08-14
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -72,7 +72,7 @@ jobs:
 
   micrortps_agent:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-04-01
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -86,7 +86,7 @@ jobs:
 
   ROS_msgs:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
@@ -99,7 +99,7 @@ jobs:
 
   ROS2_bridge:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-08-14
+    container: px4io/px4-dev-base-focal:2020-09-14
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/Jenkinsfile b/Jenkinsfile
index 97e9671d45..64e53176a8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ pipeline {
 
         stage('Airframe') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh 'make distclean'
@@ -106,7 +106,7 @@ pipeline {
 
         stage('Parameter') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh 'make distclean'
@@ -125,7 +125,7 @@ pipeline {
 
         stage('Module') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh 'make distclean'
@@ -145,7 +145,7 @@ pipeline {
         stage('uORB graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-focal:2020-08-20'
+              image 'px4io/px4-dev-nuttx-focal:2020-09-14'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -174,7 +174,7 @@ pipeline {
 
         stage('Devguide') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -204,7 +204,7 @@ pipeline {
 
         stage('Userguide') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -232,7 +232,7 @@ pipeline {
 
         stage('QGroundControl') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -260,7 +260,7 @@ pipeline {
 
         stage('microRTPS agent') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -290,7 +290,7 @@ pipeline {
 
         stage('PX4 ROS msgs') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -319,7 +319,7 @@ pipeline {
 
         stage('PX4 ROS2 bridge') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
@@ -362,7 +362,7 @@ pipeline {
 
         stage('S3') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
           }
           steps {
             sh('export')
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 6a0a7bb9e8..65dbe22e18 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -4,7 +4,7 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
 	if [[ $@ =~ .*px4_fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
-		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
 	elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]]; then
 		# aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default
 		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
@@ -27,7 +27,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
 fi
 
 # docker hygiene