diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 94f3495a20ef..a4c769fdf850 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -43,8 +43,9 @@ jobs:
           AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
+          DOCS_BUCKET: flower.ai
         run: |
-          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./doc/build/html/ s3://flower.dev/docs/framework
-          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./baselines/doc/build/html/ s3://flower.dev/docs/baselines
-          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./examples/doc/build/html/ s3://flower.dev/docs/examples
-          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./datasets/doc/build/html/ s3://flower.dev/docs/datasets
+          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./doc/build/html/ s3://${{ env.DOCS_BUCKET }}/docs/framework
+          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./baselines/doc/build/html/ s3://${{ env.DOCS_BUCKET }}/docs/baselines
+          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./examples/doc/build/html/ s3://${{ env.DOCS_BUCKET }}/docs/examples
+          aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./datasets/doc/build/html/ s3://${{ env.DOCS_BUCKET }}/docs/datasets
diff --git a/dev/deploy-docs.sh b/dev/deploy-docs.sh
deleted file mode 100755
index 69fbd567baf3..000000000000
--- a/dev/deploy-docs.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-set -e
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../
-
-ROOT=`pwd`
-
-# Build and deploy Flower Framework docs
-cd doc
-./build-versioned-docs.sh
-cd build/html
-aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./ s3://flower.dev/docs/framework
-
-# Build and deploy Flower Baselines docs
-cd $ROOT
-cd baselines/doc
-make docs
-cd build/html
-aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./ s3://flower.dev/docs/baselines
-
-# Build and deploy Flower Examples docs
-cd $ROOT
-./dev/update-examples.sh
-cd examples/doc
-make docs
-cd build/html
-aws s3 sync --delete --exclude ".*" --exclude "v/*" --cache-control "no-cache" ./ s3://flower.dev/docs/examples
diff --git a/dev/deploy-swift-docs.sh b/dev/deploy-swift-docs.sh
index 5abe618f83d3..de0bacb430cd 100755
--- a/dev/deploy-swift-docs.sh
+++ b/dev/deploy-swift-docs.sh
@@ -18,10 +18,10 @@
 set -e
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../
 
-ROOT=`pwd`
+ROOT=$(pwd)
 
 # Build and deploy Flower iOS docs
-cd $ROOT
+cd "$ROOT"
 ./dev/build-swift-api-ref.sh
 cd SwiftDoc/html
-aws s3 sync --delete --exclude ".*" --cache-control "no-cache" ./ s3://flower.dev/docs/ios
+aws s3 sync --delete --exclude ".*" --cache-control "no-cache" ./ s3://flower.ai/docs/ios