diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml
index 0abb2891e4..3f81697f8b 100644
--- a/.github/workflows/metadata.yml
+++ b/.github/workflows/metadata.yml
@@ -23,7 +23,7 @@ jobs:
         make airframe_metadata
         cd build/px4_sitl_default/docs
         ls -ls *
-      # TODO: deploy to devguide gitbook and s3
+      # TODO: deploy to userguide gitbook and s3
 
   module:
     runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
         make module_documentation
         cd build/px4_sitl_default/docs
         ls -ls *
-      # TODO: deploy to devguide gitbook and s3
+      # TODO: deploy to userguide gitbook and s3
 
   parameter:
     runs-on: ubuntu-latest
diff --git a/Jenkinsfile b/Jenkinsfile
index 77b5be826c..20b8b6b51d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -172,36 +172,6 @@ pipeline {
 
       parallel {
 
-        stage('Devguide') {
-          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            unstash 'metadata_module_documentation'
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/Devguide.git')
-              sh('cp airframes.md Devguide/en/airframes/airframe_reference.md')
-              sh('cp parameters.md Devguide/en/advanced/parameter_reference.md')
-              sh('cp -R modules/*.md Devguide/en/middleware/')
-              sh('cd Devguide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
-              sh('cd Devguide; git push origin master || true')
-              sh('rm -rf Devguide')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
         stage('Userguide') {
           agent {
             docker { image 'px4io/px4-dev-base-focal:2020-11-18' }