diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml
index 4a9ab68dca..37e023d148 100644
--- a/.github/workflows/metadata.yml
+++ b/.github/workflows/metadata.yml
@@ -21,8 +21,19 @@ jobs:
       run: |
         make airframe_metadata
         cd build/px4_sitl_default/docs
-        ls -ls *
-      # TODO: deploy to userguide gitbook and s3
+        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_sitl_default >> $GITHUB_ENV
+      # TODO: deploy to userguide gitbook
+
+    - uses: jakejarvis/s3-sync-action@master
+      with:
+        args: --acl public-read
+      env:
+        AWS_S3_BUCKET: 'px4-travis'
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_REGION: 'us-west-1'
+        SOURCE_DIR: 'build/px4_sitl_default/docs/'
+        DEST_DIR: 'Firmware/${{ env.version }}/_general/'
 
   module:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 846f0c7cff..01bb3407cf 100644
--- a/Makefile
+++ b/Makefile
@@ -326,7 +326,7 @@ parameters_metadata:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters ver_gen
 
 airframe_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes
+	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes ver_gen
 
 module_documentation:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_module_documentation