diff --git a/.github/workflows/build-citus-enterprise-nightlies.yml b/.github/workflows/build-citus-enterprise-nightlies.yml
deleted file mode 100644
index 4b1678508..000000000
--- a/.github/workflows/build-citus-enterprise-nightlies.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Build and publish citus entertprise nightly packages
-
-env:
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-  PACKAGING_PASSPHRASE: ${{ secrets.PACKAGING_PASSPHRASE }}
-  PACKAGING_SECRET_KEY: ${{ secrets.PACKAGING_SECRET_KEY }}
-  UNENCRYPTED_PACKAGE: true
-  DOCKERHUB_USER_NAME: ${{ secrets.DOCKERHUB_USER_NAME }}
-  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-on:
-  # TODO: revert this once we finish backports of security patches
-  # push:
-  #   branches:
-  #     - "**"
-  workflow_dispatch:
-
-jobs:
-  build_package:
-    name: Build package
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - el/7
-          - el/8
-          - ol/7
-          - debian/stretch
-          - debian/buster
-          - debian/bullseye
-          - ubuntu/bionic
-          - ubuntu/focal
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # This step is to fetch the images unanonymously to have higher bandwidth
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USER_NAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Clone tools branch
-        run: git clone -b v0.8.12 --depth=1  https://github.com/citusdata/tools.git tools
-
-      - name: Install package dependencies
-        run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources
-
-      - name: Install python requirements
-        run: python -m pip install -r tools/packaging_automation/requirements.txt
-
-      - name: Build packages
-        run: |
-          python -m  tools.packaging_automation.citus_package \
-          --gh_token "${GH_TOKEN}" \
-          --platform "${{ matrix.platform }}" \
-          --build_type "nightly" \
-          --secret_key "${PACKAGING_SECRET_KEY}" \
-          --passphrase "${PACKAGING_PASSPHRASE}" \
-          --output_dir "$(pwd)/packages/" \
-          --input_files_dir "$(pwd)"
-
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index 5c0e6b8ea..4c5d3dd44 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -1,7 +1,7 @@
 name: Build Package
 
 env:
-  MAIN_BRANCH: "all-enterprise"
+  MAIN_BRANCH: "8.3.4-ent-base"
   PACKAGE_CLOUD_REPO_NAME: "citusdata/enterprise"
   PACKAGE_CLOUD_API_TOKEN: ${{ secrets.PACKAGE_CLOUD_API_TOKEN }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -23,21 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - el/7
-          - el/8
-          - ol/7
-          - ol/8
-          - debian/stretch
-          - debian/buster
-          - ubuntu/bionic
-          - ubuntu/focal
+          - ubuntu/jammy
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
       - name: Clone tools branch
-        run: git clone -b v0.8.12 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.24 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources
diff --git a/packaging_ignore.yml b/packaging_ignore.yml
index 255febf68..0a45dfea3 100644
--- a/packaging_ignore.yml
+++ b/packaging_ignore.yml
@@ -17,6 +17,14 @@ base:
   - ".* unused substitution variable \\$\\{postgresql:Depends\\}.*"
   - ".* warning: field 'compareValueFunctionCall' with variable sized type 'FunctionCall2InfoData'.*"
   - "1 warning generated"
+  - ".*: warning: 'RSA_new' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]"
+  - ".*: warning: 'RSA_generate_key_ex' is deprecated: Since OpenSSL 3.0 \\[-Wdeprecated-declarations\\]"
+  - ".*: warning: 'RSA_new' is deprecated \\[-Wdeprecated-declarations\\]"
+  - ".*: warning: 'RSA_generate_key_ex' is deprecated \\[-Wdeprecated-declarations\\]"
+  - ".*: warning: 'EVP_PKEY_assign' is deprecated.*"
+  - "autoreconf: warning: autoconf input should be named 'configure.ac', not 'configure.in'"
+  - "autoheader: warning: autoconf input should be named 'configure.ac', not 'configure.in'"
+  - "\\d+ warnings generated."
 
 debian:
   - ".*: W: invalid-license Commercial"