diff --git a/.build/deploy-site.sh b/.build/deploy-site.sh
index 151d8d0ba..6a7d88124 100755
--- a/.build/deploy-site.sh
+++ b/.build/deploy-site.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 echo "🚧 Building..."
 cd documentation || exit 1
-mvn clean test && cd src/main/jekyll  && bundle install && JEKYLL_ENV=production bundle exec jekyll build  && cd - || exit 1
+mvn clean test && cd src/main/jekyll && gem install bundler && bundle install && JEKYLL_ENV=production bundle exec jekyll build  && cd - || exit 1
 echo "🍺 Site generated in 'target/_site'"
 
 echo "🚧 Cloning web site in target/site"
diff --git a/.build/deploy.sh b/.build/deploy.sh
index b55210842..4a545f6d5 100644
--- a/.build/deploy.sh
+++ b/.build/deploy.sh
@@ -65,9 +65,6 @@ deploy_release() {
 
     echo "Deploying release artifacts"
     mvn -B clean deploy -DskipTests -Prelease -s maven-settings.xml
-
-    echo "Deploying documentation"
-    .build/deploy-site.sh
 }
 
 init_git
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 61f1e27fe..9e128de7c 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -42,6 +42,14 @@ jobs:
 
           .build/deploy.sh ${{ github.event.deployment.environment }}
 
+      - name: 'Setup Ruby'
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+
+      - name: 'Deploy the website'
+        run: .build/deploy-site.sh
+
       - name: update deploy status
         if: always()
         uses: unacast/actions-github-deployment-status@0.2