diff --git a/.github/workflows/nightly-acceptance.yml b/.github/workflows/nightly-acceptance.yml
new file mode 100644
index 0000000000..b8b7f50798
--- /dev/null
+++ b/.github/workflows/nightly-acceptance.yml
@@ -0,0 +1,27 @@
+# Dispatch to the consul-k8s-workflows with a nightly cron
+name: nightly-acceptance
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Run nightly at 12AM UTC/8PM EST/5PM PST
+    - cron:  '0 0 * * *'
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.16-dev # Consul's enterprise version to use in tests
+  BRANCH: ${{ github.ref_name }}
+  CONTEXT: "nightly"
+
+jobs:
+  cloud:
+    name: cloud
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: cloud
+      with:
+        workflow: cloud.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 0000000000..d006c2514c
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,31 @@
+# Dispatch to the consul-k8s-workflows when a PR is created and on merges to main/release*
+name: pr
+on:
+  pull_request:
+  push:
+    # Sequence of patterns matched against refs/heads
+    branches:
+      # Push events on main branch
+      - main
+      # Push events to branches matching refs/heads/release/**
+      - "release/**"
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.16-dev # Consul's enterprise version to use in tests. We use this consul image on release branches too
+  BRANCH: ${{ github.head_ref || github.ref_name }} 
+  CONTEXT: "${{ github.actor }}"
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: test
+      with:
+        workflow: test.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/.github/workflows/reusable-acceptance.yml b/.github/workflows/reusable-acceptance.yml
deleted file mode 100644
index cf1e11e3f5..0000000000
--- a/.github/workflows/reusable-acceptance.yml
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-
-name: reusable-acceptance
-
-on:
-  workflow_call:
-    inputs:
-      name:
-        required: true
-        type: string
-      additional-flags:
-        required: false
-        type: string
-        default: ""
-      consul-k8s-image:
-        required: false
-        type: string
-      directory:
-        required: true
-        type: string
-      go-version:
-        required: true
-        type: string
-      gotestsum-version:
-        required: true
-        type: string
-      kind-version:
-        required: false
-        type: string
-        default: "v1.24.6"
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
-    secrets:
-        CONSUL_ENT_LICENSE:
-          required: true
-        VAULT_LICENSE:
-          required: true
-
-# Environment variables can only be used at the step level
-env:
-  TEST_RESULTS: /tmp/test-results # path to where test results are saved
-  CONSUL_ENT_LICENSE: ${{ secrets.CONSUL_ENT_LICENSE }}
-  VAULT_LICENSE: ${{ secrets.VAULT_LICENSE }}
-  CONSUL_K8S_IMAGE: ${{ inputs.consul-k8s-image }}
-
-jobs:
-  job:
-    runs-on: [custom, linux, xl]
-    strategy: 
-      matrix:
-        include:
-          - {runner: "0", test-packages: "basic consul-dns metrics"}
-          - {runner: "1", test-packages: "connect"}
-          - {runner: "2", test-packages: "controller example"}
-          - {runner: "3", test-packages: "ingress-gateway"}
-          - {runner: "4", test-packages: "partitions"}
-          - {runner: "5", test-packages: "peering"}
-          - {runner: "6", test-packages: "snapshot-agent vault wan-federation"}
-          - {runner: "7", test-packages: "cli sync terminating-gateway"}
-
-      fail-fast: false
-    steps:      
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.checkout-ref }}
-      
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ inputs.go-version }}
-
-      - name: Setup go mod cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Install pre-requisites # Install gotestsum, kind, kubectl, and helm
-        run: |
-          wget https://github.com/gotestyourself/gotestsum/releases/download/v1.6.4/gotestsum_1.6.4_linux_amd64.tar.gz
-          sudo tar -C /usr/local/bin -xzf gotestsum_1.6.4_linux_amd64.tar.gz
-          rm gotestsum_1.6.4_linux_amd64.tar.gz
-
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.15.0/kind-linux-amd64
-          chmod +x ./kind
-          sudo mv ./kind /usr/local/bin/kind
-
-          curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
-          chmod +x ./kubectl
-          sudo mv ./kubectl /usr/local/bin/kubectl
-
-          wget https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz
-          tar -zxvf helm-v3.9.4-linux-amd64.tar.gz
-          sudo mv linux-amd64/helm /usr/local/bin/helm
-
-      - run: mkdir -p ${{ env.TEST_RESULTS }}
-
-      - name: go mod download
-        working-directory: ${{ inputs.directory }}
-        run: go mod download
-      
-      - name: Create kind clusters
-        run: |
-          kind create cluster --name dc1 --image kindest/node:${{ inputs.kind-version }}
-          kind create cluster --name dc2 --image kindest/node:${{ inputs.kind-version }}
-
-      - name: Build CLI
-        run: |
-          sudo make cli-dev
-          consul-k8s version
-
-      # We have to run the tests for each package separately so that we can
-      # exit early if any test fails (-failfast only works within a single
-      # package).
-      - name: Run acceptance tests ${{ matrix.runner }}
-        working-directory: ${{ inputs.directory }}
-        if: github.repository_owner == 'hashicorp' # This prevents running on forks
-        run: |
-          exit_code=0
-          echo "Running packages: ${{ matrix.test-packages }}"
-          for pkg in $(echo ${{ matrix.test-packages }})
-          do
-            fullpkg="github.com/hashicorp/consul-k8s/${{ inputs.directory }}/${pkg}"
-            echo "Testing package: ${fullpkg}"
-            if ! gotestsum --format=testname --jsonfile=jsonfile-${pkg////-} -- ${fullpkg} -p 1 -timeout 2h -failfast \
-              ${{ inputs.additional-flags }} \
-              -enable-enterprise \
-              -enable-multi-cluster \
-              -debug-directory=${{ env.TEST_RESULTS }}/debug \
-              -consul-k8s-image=${{ inputs.consul-k8s-image }} 
-            then
-              echo "Tests in ${pkg} failed, aborting early"
-              exit_code=1
-              break
-            fi
-          done
-          gotestsum --format=testname --raw-command --junitfile "${{ env.TEST_RESULTS }}/gotestsum-report.xml" -- cat jsonfile*
-          exit $exit_code
-    
-      - name: Upload tests
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ inputs.name }}-${{ matrix.test-packages }}-gotestsum-report.xml
-          path: ${{ env.TEST_RESULTS }}/gotestsum-report.xml
-
-      - name: Upload debug (on failure)
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ inputs.name }}-${{ matrix.test-packages }}-debug-info
-          path: ${{ env.TEST_RESULTS }}/debug
diff --git a/.github/workflows/reusable-golangci-lint.yml b/.github/workflows/reusable-golangci-lint.yml
deleted file mode 100644
index e8fcd79440..0000000000
--- a/.github/workflows/reusable-golangci-lint.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-
-name: golangci-lint
-
-on:
-  workflow_call:
-    inputs:
-      directory:
-        required: true
-        type: string
-      go-version:
-        required: true
-        type: string
-      args:
-        required: false
-        type: string
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-
-    steps:      
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ inputs.go-version }}
-     
-      - name: golangci-lint-${{inputs.directory}}
-        uses: golangci/golangci-lint-action@v3.4.0
-        with:
-          version: v1.51
-          working-directory: ${{inputs.directory}}
-          args: ${{inputs.args}}
diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml
deleted file mode 100644
index dd2dd4e4a0..0000000000
--- a/.github/workflows/reusable-unit.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-
-name: reusable-unit 
-
-on:
-  workflow_call:
-    inputs:
-      directory:
-        required: true
-        type: string
-      go-version:
-        required: true
-        type: string
-
-# Environment variables can only be used at the step level
-env:
-  TEST_RESULTS: /tmp/test-results # path to where test results are saved
-  GOTESTSUM_VERSION: 1.8.2
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-
-    steps:      
-      - name: Checkout code
-        uses: actions/checkout@v3
-      
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{inputs.go-version}}
-
-      - name: Setup go mod cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Install gotestsum
-        run: |
-          wget https://github.com/gotestyourself/gotestsum/releases/download/v${{env.GOTESTSUM_VERSION}}/gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          sudo tar -C /usr/local/bin -xzf gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          rm gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-
-      - run: mkdir -p ${{env.TEST_RESULTS}}
-
-      - name: go mod download
-        working-directory: ${{inputs.directory}}
-        run: go mod download
-
-      - name: Run tests 
-        working-directory: ${{inputs.directory}}
-        run: |
-          gotestsum --format=testname --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml ./... -- -p 4
-         
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 6e6212e0d8..0000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-
-name: test
-on:
-  push:
-
-env:
-  TEST_RESULTS: /tmp/test-results # path to where test results are saved
-  GOTESTSUM_VERSION: 1.8.2 # You cannot use environment variables with workflows. The gotestsum version is hardcoded in the reusable workflows too.
-  # We use docker images to copy the consul binary for unit tests.
-  CONSUL_OSS_DOCKER_IMAGE: hashicorppreview/consul:1.16-dev # Consul's OSS version to use in tests
-  CONSUL_ENT_DOCKER_IMAGE: hashicorppreview/consul-enterprise:1.16-dev # Consul's enterprise version to use in tests
-
-jobs:
-  terraform-fmt-check:
-    name: "Terraform format check"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: TERRAFORM_VERSION
-          terraform_wrapper: false
-      - name: Run Terraform checks
-        run: |
-          make terraform-fmt-check TERRAFORM_DIR="${{ github.workspace }}"
-
-  get-go-version:
-    name: "Determine Go toolchain version"
-    runs-on: ubuntu-latest
-    outputs:
-      go-version: ${{ steps.get-go-version.outputs.go-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Determine Go version
-        id: get-go-version
-        # We use .go-version as our source of truth for current Go
-        # version, because "goenv" can react to it automatically.
-        run: |
-          echo "Building with Go $(cat .go-version)"
-          echo "::set-output name=go-version::$(cat .go-version)"
-
-  get-product-version:
-    runs-on: ubuntu-latest
-    outputs:
-      product-version: ${{ steps.get-product-version.outputs.product-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: get product version
-        id: get-product-version
-        run: |
-          make version
-          echo "::set-output name=product-version::$(make version)"
-
-  validate-helm-gen:
-    needs:
-      - get-go-version
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-      - name: Setup go mod cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Validate helm gen 
-        working-directory: hack/helm-reference-gen 
-        run: |
-          go run ./... -validate
-
-  golangci-lint-helm-gen:
-   needs:
-    - get-go-version
-   uses: ./.github/workflows/reusable-golangci-lint.yml
-   with:
-      directory: hack/helm-reference-gen
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-      #TODO: This is a workaround in order to get pipelines working. godot and staticcheck fail for helm-reference-gen
-      args: "--no-config --disable-all --enable gofmt,govet"
-
-  unit-helm-gen:
-    needs: [get-go-version, golangci-lint-helm-gen, validate-helm-gen]
-    uses: ./.github/workflows/reusable-unit.yml
-    with:
-      directory: hack/helm-reference-gen
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-  unit-test-helm-templates:
-    needs: 
-      - unit-helm-gen
-    runs-on: ubuntu-latest
-    container: 
-      image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.15.0
-      options: --user 1001
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-   
-      - name: Run Unit Tests
-        working-directory: charts/consul
-        run:  bats --jobs 4 ./test/unit
-
-  lint-control-plane:
-    needs:
-      - get-go-version
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-      - run: go install github.com/hashicorp/lint-consul-retry@master && lint-consul-retry
-
-      - name: Run lint
-        working-directory: control-plane
-        run: go run hack/lint-api-new-client/main.go
-
-  golangci-lint-control-plane:
-    needs:
-      - get-go-version
-    uses: ./.github/workflows/reusable-golangci-lint.yml
-    with:
-      directory: control-plane
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-  test-control-plane:
-    needs: [get-go-version, lint-control-plane, golangci-lint-control-plane]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-      - name: Setup go mod cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Install gotestsum
-        run: |
-          wget https://github.com/gotestyourself/gotestsum/releases/download/v${{env.GOTESTSUM_VERSION}}/gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          sudo tar -C /usr/local/bin -xzf gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          rm gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-
-      - run:  mkdir -p ${{env.TEST_RESULTS}}
-      - run:  echo "$HOME/bin" >> $GITHUB_PATH
-
-      - name: Download consul
-        working-directory: control-plane
-        run: |
-          mkdir -p $HOME/bin
-          container_id=$(docker create ${{env.CONSUL_OSS_DOCKER_IMAGE}})
-          docker cp "$container_id:/bin/consul" $HOME/bin/consul
-          docker rm "$container_id"
-      - name: Run go tests
-        working-directory: control-plane
-        run: |
-            PACKAGE_NAMES=$(go list ./...)
-            gotestsum --format=testname --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- -p 4 $PACKAGE_NAMES
-
-  test-enterprise-control-plane:
-    if: github.repository_owner == 'hashicorp' # Do not run on forks as this requires secrets
-    needs: [get-go-version, lint-control-plane, golangci-lint-control-plane]
-    runs-on: ubuntu-latest
-    env:
-      CONSUL_LICENSE: ${{secrets.CONSUL_LICENSE}}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-      - name: Setup go mod cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Install gotestsum
-        run: |
-          wget https://github.com/gotestyourself/gotestsum/releases/download/v${{env.GOTESTSUM_VERSION}}/gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          sudo tar -C /usr/local/bin -xzf gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-          rm gotestsum_${{env.GOTESTSUM_VERSION}}_linux_amd64.tar.gz
-
-      - run:  mkdir -p ${{env.TEST_RESULTS}}
-      - run:  echo "$HOME/bin" >> $GITHUB_PATH
-
-      - name: Download consul
-        working-directory: control-plane
-        run: |
-          mkdir -p $HOME/bin
-          container_id=$(docker create ${{env.CONSUL_ENT_DOCKER_IMAGE}})
-          docker cp "$container_id:/bin/consul" $HOME/bin/consul
-          docker rm "$container_id"
-
-      - name: Run go tests
-        working-directory: control-plane
-        run: |
-            PACKAGE_NAMES=$(go list ./...)
-            gotestsum --format=testname --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- -tags=enterprise -p 4 $PACKAGE_NAMES
-
-  build-distros:
-    needs: [get-go-version, get-product-version]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          # cli
-          - {go: "${{ needs.get-go-version.outputs.go-version }}", goos: "linux", goarch: "amd64", component: "cli", pkg_name: "consul-k8s", "bin_name": "consul-k8s" }
-          # control-plane
-          - {go: "${{ needs.get-go-version.outputs.go-version }}", goos: "linux", goarch: "amd64", component: "control-plane", pkg_name: "consul-k8s-control-plane", "bin_name": "consul-k8s-control-plane" }
-          # consul-cni
-          - {go: "${{ needs.get-go-version.outputs.go-version }}", goos: "linux", goarch: "amd64", component: "control-plane/cni", pkg_name: "consul-cni", "bin_name": "consul-cni" }
-
-      fail-fast: true
-
-    name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} ${{ matrix.component }} build
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Build
-        env:
-          GOOS: ${{ matrix.goos }}
-          GOARCH: ${{ matrix.goarch }}
-          CGO_ENABLED: 0
-        working-directory: ${{ matrix.component }}
-        run: |
-          mkdir -p dist out
-
-          export GIT_COMMIT=$(git rev-parse --short HEAD)
-          export GIT_DIRTY=$(test -n "$(git status --porcelain)" && echo "+CHANGES")
-          export GIT_IMPORT=github.com/hashicorp/consul-k8s/${{ matrix.component }}/version
-          export GOLDFLAGS="-X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -X ${GIT_IMPORT}.GitDescribe=${{ needs.get-product-version.outputs.product-version }}"
-
-          CGO_ENABLED=0 go build -o dist/${{ matrix.bin_name }} -ldflags "${GOLDFLAGS}" .
-          zip -r -j out/${{ matrix.pkg_name }}_${{ needs.get-product-version.outputs.product-version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip dist/
-
-      - name: Upload built binaries
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.pkg_name }}_${{ needs.get-product-version.outputs.product-version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip
-          path: ${{ matrix.component}}/out/${{ matrix.pkg_name }}_${{ needs.get-product-version.outputs.product-version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip
-
-  golangci-lint-acceptance:
-    needs:
-      - get-go-version
-    uses: ./.github/workflows/reusable-golangci-lint.yml
-    with:
-      directory:  acceptance 
-      go-version: ${{ needs.get-go-version.outputs.go-version }} 
-
-  unit-acceptance-framework:
-    needs: [get-go-version, golangci-lint-acceptance]
-    uses: ./.github/workflows/reusable-unit.yml
-    with:
-      directory: acceptance/framework
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-  golangci-lint-cli:
-    needs:
-      - get-go-version
-    uses: ./.github/workflows/reusable-golangci-lint.yml
-    with:
-      directory: cli 
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-  unit-cli:
-    needs: [get-go-version, golangci-lint-cli]
-    uses: ./.github/workflows/reusable-unit.yml
-    with:
-      directory: cli 
-      go-version: ${{ needs.get-go-version.outputs.go-version }}
-
-  # upload dev docker image
-  dev-upload-docker:
-    if: github.repository_owner == 'hashicorp' # Do not run on forks as this requires secrets
-    needs: [ get-product-version, build-distros ]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: ["amd64"]
-    env:
-      repo: ${{ github.event.repository.name }}
-      version: ${{ needs.get-product-version.outputs.product-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
-        with:
-          name: consul-cni_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
-          path: control-plane/dist/cni/linux/${{ matrix.arch }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: consul-k8s-control-plane_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
-          path: control-plane/dist/linux/${{ matrix.arch }}
-      - name: extract consul-cni zip
-        env:
-          ZIP_LOCATION: control-plane/dist/cni/linux/${{ matrix.arch }}
-        run: |
-          cd "${ZIP_LOCATION}"
-          unzip -j *.zip
-      - name: extract control-plane zip
-        env:
-          ZIP_LOCATION: control-plane/dist/linux/${{ matrix.arch }}
-        run: |
-          cd "${ZIP_LOCATION}"
-          unzip -j *.zip
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-      - name: Docker Build (Action)
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          context: control-plane
-          platforms: ${{ matrix.arch }}
-          target: release-default
-          tags: docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.version }}-pr-${{ github.sha }}
-
-# Disable GHA acceptance tests until GHA formally supported
-#  acceptance:
-#    needs: [ get-product-version, dev-upload-docker, get-go-version ]
-#    uses: ./.github/workflows/reusable-acceptance.yml
-#    with:
-#      name: acceptance
-#      directory: acceptance/tests
-#      go-version: ${{ needs.get-go-version.outputs.go-version }}
-#      additional-flags: "-use-kind -kubecontext=kind-dc1 -secondary-kubecontext=kind-dc2 -consul-image=docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.14-dev"
-#      gotestsum-version: 1.8.2
-#      consul-k8s-image: docker.io/hashicorppreview/${{ github.event.repository.name }}-control-plane:${{ needs.get-product-version.outputs.product-version }}-pr-${{ github.sha }}
-#    secrets:
-#      CONSUL_ENT_LICENSE: ${{ secrets.CONSUL_ENT_LICENSE }}
-#
-#  acceptance-tproxy:
-#    needs: [ get-product-version, dev-upload-docker, get-go-version ]
-#    uses: ./.github/workflows/reusable-acceptance.yml
-#    with:
-#      name: acceptance-tproxy
-#      directory: acceptance/tests
-#      go-version: ${{ needs.get-go-version.outputs.go-version }}
-#      additional-flags: "-use-kind -kubecontext=kind-dc1 -secondary-kubecontext=kind-dc2 -enable-transparent-proxy -consul-image=docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.14-dev"
-#      gotestsum-version: 1.8.2
-#      consul-k8s-image: docker.io/hashicorppreview/${{ github.event.repository.name }}-control-plane:${{ needs.get-product-version.outputs.product-version }}-pr-${{ github.sha }}
-#    secrets:
-#      CONSUL_ENT_LICENSE: ${{ secrets.CONSUL_ENT_LICENSE }}
-#
-#  acceptance-cni:
-#    needs: [ get-product-version, dev-upload-docker, get-go-version ]
-#    uses: ./.github/workflows/reusable-acceptance.yml
-#    with:
-#      name: acceptance
-#      directory: acceptance/tests
-#      go-version: ${{ needs.get-go-version.outputs.go-version }}
-#      additional-flags: "-use-kind -kubecontext=kind-dc1 -secondary-kubecontext=kind-dc2 -enable-transparent-proxy -enable-cni -consul-image=docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.14-dev"
-#      gotestsum-version: 1.8.2
-#      consul-k8s-image: docker.io/hashicorppreview/${{ github.event.repository.name }}-control-plane:${{ needs.get-product-version.outputs.product-version }}-pr-${{ github.sha }}
-#    secrets:
-#      CONSUL_ENT_LICENSE: ${{ secrets.CONSUL_ENT_LICENSE }}
-
-
diff --git a/.github/workflows/weekly-acceptance-0-49-x.yml b/.github/workflows/weekly-acceptance-0-49-x.yml
new file mode 100644
index 0000000000..7025bcb241
--- /dev/null
+++ b/.github/workflows/weekly-acceptance-0-49-x.yml
@@ -0,0 +1,29 @@
+# Dispatch to the consul-k8s-workflows with a weekly cron
+#
+# A separate file is needed for each release because the cron schedules are different for each release.
+name: weekly-acceptance-0-49-x
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Run weekly on Monday at 3AM UTC/11PM EST/8PM PST
+    - cron:  '0 3 * * 1'
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.13-dev # Consul's enterprise version to use in tests
+  BRANCH: "release/0.49.x"
+  CONTEXT: "weekly"
+
+jobs:
+  cloud:
+    name: cloud
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: cloud
+      with:
+        workflow: cloud.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/.github/workflows/weekly-acceptance-1-0-x.yml b/.github/workflows/weekly-acceptance-1-0-x.yml
new file mode 100644
index 0000000000..4aa49594f3
--- /dev/null
+++ b/.github/workflows/weekly-acceptance-1-0-x.yml
@@ -0,0 +1,30 @@
+# Dispatch to the consul-k8s-workflows with a weekly cron
+#
+# A separate file is needed for each release because the cron schedules are different for each release.
+name: weekly-acceptance-1-0-x
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Run weekly on Tuesday at 3AM UTC/11PM EST/8PM PST
+    - cron:  '0 3 * * 2'
+
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.14-dev # Consul's enterprise version to use in tests
+  BRANCH: "release/1.0.x"
+  CONTEXT: "weekly"
+
+jobs:
+  cloud:
+    name: cloud
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: cloud
+      with:
+        workflow: cloud.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/.github/workflows/weekly-acceptance-1-1-x.yml b/.github/workflows/weekly-acceptance-1-1-x.yml
new file mode 100644
index 0000000000..1ffc6f8684
--- /dev/null
+++ b/.github/workflows/weekly-acceptance-1-1-x.yml
@@ -0,0 +1,30 @@
+# Dispatch to the consul-k8s-workflows with a weekly cron
+#
+# A separate file is needed for each release because the cron schedules are different for each release.
+name: weekly-acceptance-1-1-x
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Run weekly on Wednesday at 3AM UTC/11PM EST/8PM PST
+    - cron:  '0 3 * * 3'
+
+
+# these should be the only settings that you will ever need to change
+env:
+  CONSUL_IMAGE: hashicorppreview/consul-enterprise:1.15-dev # Consul's enterprise version to use in tests
+  BRANCH: "release/1.1.x"
+  CONTEXT: "weekly"
+
+jobs:
+  cloud:
+    name: cloud
+    runs-on: ubuntu-latest
+    steps:
+    - uses: benc-uk/workflow-dispatch@v1.2.2
+      name: cloud
+      with:
+        workflow: cloud.yml
+        repo: hashicorp/consul-k8s-workflows
+        ref: main
+        token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}", "consul-image":"${{ env.CONSUL_IMAGE }}" }'
diff --git a/acceptance/framework/consul/helm_cluster.go b/acceptance/framework/consul/helm_cluster.go
index f34aab6455..e03e3615fc 100644
--- a/acceptance/framework/consul/helm_cluster.go
+++ b/acceptance/framework/consul/helm_cluster.go
@@ -146,14 +146,14 @@ func (h *HelmCluster) Destroy(t *testing.T) {
 		"--wait": nil,
 	}
 
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 15}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 30}, t, func(r *retry.R) {
 		err := helm.DeleteE(t, h.helmOptions, h.releaseName, false)
 		require.NoError(r, err)
 	})
 
 	// Retry because sometimes certain resources (like PVC) take time to delete
 	// in cloud providers.
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 600}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 600}, t, func(r *retry.R) {
 		// Force delete any pods that have h.releaseName in their name because sometimes
 		// graceful termination takes a long time and since this is an uninstall
 		// we don't care that they're stopped gracefully.
@@ -330,7 +330,7 @@ func (h *HelmCluster) SetupConsulClient(t *testing.T, secure bool) (client *api.
 		if h.ACLToken != "" {
 			config.Token = h.ACLToken
 		} else {
-			retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 600}, t, func(r *retry.R) {
+			retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 600}, t, func(r *retry.R) {
 				// Get the ACL token. First, attempt to read it from the bootstrap token (this will be true in primary Consul servers).
 				// If the bootstrap token doesn't exist, it means we are running against a secondary cluster
 				// and will try to read the replication token from the federation secret.
@@ -534,7 +534,7 @@ func defaultValues() map[string]string {
 
 func CreateK8sSecret(t *testing.T, client kubernetes.Interface, cfg *config.TestConfig, namespace, secretName, secretKey, secret string) {
 
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 15}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 15}, t, func(r *retry.R) {
 		_, err := client.CoreV1().Secrets(namespace).Get(context.Background(), secretName, metav1.GetOptions{})
 		if errors.IsNotFound(err) {
 			_, err := client.CoreV1().Secrets(namespace).Create(context.Background(), &corev1.Secret{
diff --git a/acceptance/framework/helpers/helpers.go b/acceptance/framework/helpers/helpers.go
index 544079b8fb..3e6ef039b2 100644
--- a/acceptance/framework/helpers/helpers.go
+++ b/acceptance/framework/helpers/helpers.go
@@ -38,7 +38,7 @@ func CheckForPriorInstallations(t *testing.T, client kubernetes.Interface, optio
 	// Check if there's an existing cluster and fail if there is one.
 	// We may need to retry since this is the first command run once the Kube
 	// cluster is created and sometimes the API server returns errors.
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 15}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 15}, t, func(r *retry.R) {
 		var err error
 		// NOTE: It's okay to pass in `t` to RunHelmCommandAndGetOutputE despite being in a retry
 		// because we're using RunHelmCommandAndGetOutputE (not RunHelmCommandAndGetOutput) so the `t` won't
@@ -58,7 +58,7 @@ func CheckForPriorInstallations(t *testing.T, client kubernetes.Interface, optio
 
 	// Wait for all pods in the "default" namespace to exit. A previous
 	// release may not be listed by Helm but its pods may still be terminating.
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 60}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 60}, t, func(r *retry.R) {
 		pods, err := client.CoreV1().Pods(options.KubectlOptions.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: labelSelector})
 		require.NoError(r, err)
 		if len(pods.Items) > 0 {
diff --git a/acceptance/framework/k8s/helpers.go b/acceptance/framework/k8s/helpers.go
index efac5b35db..235d26d061 100644
--- a/acceptance/framework/k8s/helpers.go
+++ b/acceptance/framework/k8s/helpers.go
@@ -43,10 +43,10 @@ func WaitForAllPodsToBeReady(t *testing.T, client kubernetes.Interface, namespac
 
 	logger.Logf(t, "Waiting for pods with label %q to be ready.", podLabelSelector)
 
-	// Wait up to 11m.
+	// Wait up to 20m.
 	// On Azure, volume provisioning can sometimes take close to 5 min,
 	// so we need to give a bit more time for pods to become healthy.
-	counter := &retry.Counter{Count: 11 * 60, Wait: 1 * time.Second}
+	counter := &retry.Counter{Count: 20 * 60, Wait: 2 * time.Second}
 	retry.RunWith(counter, t, func(r *retry.R) {
 		pods, err := client.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: podLabelSelector})
 		require.NoError(r, err)
@@ -113,7 +113,7 @@ func ServiceHost(t *testing.T, cfg *config.TestConfig, ctx environment.TestConte
 		var host string
 		// It can take some time for the load balancers to be ready and have an IP/Hostname.
 		// Wait for 5 minutes before failing.
-		retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 600}, t, func(r *retry.R) {
+		retry.RunWith(&retry.Counter{Wait: 2 * time.Second, Count: 600}, t, func(r *retry.R) {
 			svc, err := ctx.KubernetesClient(t).CoreV1().Services(ctx.KubectlOptions(t).Namespace).Get(context.Background(), serviceName, metav1.GetOptions{})
 			require.NoError(t, err)
 			require.NotEmpty(r, svc.Status.LoadBalancer.Ingress)
diff --git a/acceptance/framework/k8s/kubectl.go b/acceptance/framework/k8s/kubectl.go
index 4416c7e6a9..ea90212e04 100644
--- a/acceptance/framework/k8s/kubectl.go
+++ b/acceptance/framework/k8s/kubectl.go
@@ -56,7 +56,7 @@ func RunKubectlAndGetOutputWithLoggerE(t *testing.T, options *k8s.KubectlOptions
 	}
 
 	counter := &retry.Counter{
-		Count: 3,
+		Count: 10,
 		Wait:  1 * time.Second,
 	}
 	var output string
diff --git a/acceptance/framework/portforward/port_forward.go b/acceptance/framework/portforward/port_forward.go
index 0a48e8d300..3242541cc5 100644
--- a/acceptance/framework/portforward/port_forward.go
+++ b/acceptance/framework/portforward/port_forward.go
@@ -27,7 +27,7 @@ func CreateTunnelToResourcePort(t *testing.T, resourceName string, remotePort in
 		logger)
 
 	// Retry creating the port forward since it can fail occasionally.
-	retry.RunWith(&retry.Counter{Wait: 3 * time.Second, Count: 60}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 5 * time.Second, Count: 60}, t, func(r *retry.R) {
 		// NOTE: It's okay to pass in `t` to ForwardPortE despite being in a retry
 		// because we're using ForwardPortE (not ForwardPort) so the `t` won't
 		// get used to fail the test, just for logging.
diff --git a/acceptance/framework/vault/vault_cluster.go b/acceptance/framework/vault/vault_cluster.go
index d09b8ed75e..26da56b646 100644
--- a/acceptance/framework/vault/vault_cluster.go
+++ b/acceptance/framework/vault/vault_cluster.go
@@ -113,7 +113,7 @@ func (v *VaultCluster) SetupVaultClient(t *testing.T) *vapi.Client {
 		v.logger)
 
 	// Retry creating the port forward since it can fail occasionally.
-	retry.RunWith(&retry.Counter{Wait: 1 * time.Second, Count: 60}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Wait: 5 * time.Second, Count: 60}, t, func(r *retry.R) {
 		// NOTE: It's okay to pass in `t` to ForwardPortE despite being in a retry
 		// because we're using ForwardPortE (not ForwardPort) so the `t` won't
 		// get used to fail the test, just for logging.
diff --git a/acceptance/tests/config-entries/config_entries_namespaces_test.go b/acceptance/tests/config-entries/config_entries_namespaces_test.go
index 05ea9e5235..c15277a6ee 100644
--- a/acceptance/tests/config-entries/config_entries_namespaces_test.go
+++ b/acceptance/tests/config-entries/config_entries_namespaces_test.go
@@ -136,7 +136,7 @@ func TestControllerNamespaces(t *testing.T) {
 				// On startup, the controller can take upwards of 1m to perform
 				// leader election so we may need to wait a long time for
 				// the reconcile loop to run (hence the 1m timeout here).
-				counter := &retry.Counter{Count: 60, Wait: 1 * time.Second}
+				counter := &retry.Counter{Count: 60, Wait: 2 * time.Second}
 				retry.RunWith(counter, t, func(r *retry.R) {
 					// service-defaults
 					entry, _, err := consulClient.ConfigEntries().Get(api.ServiceDefaults, "defaults", queryOpts)
@@ -258,7 +258,7 @@ func TestControllerNamespaces(t *testing.T) {
 				patchSNI := "patch-sni"
 				k8s.RunKubectl(t, ctx.KubectlOptions(t), "patch", "-n", KubeNS, "terminatinggateway", "terminating-gateway", "-p", fmt.Sprintf(`{"spec": {"services": [{"name":"name","caFile":"caFile","certFile":"certFile","keyFile":"keyFile","sni":"%s"}]}}`, patchSNI), "--type=merge")
 
-				counter := &retry.Counter{Count: 10, Wait: 500 * time.Millisecond}
+				counter := &retry.Counter{Count: 20, Wait: 2 * time.Second}
 				retry.RunWith(counter, t, func(r *retry.R) {
 					// service-defaults
 					entry, _, err := consulClient.ConfigEntries().Get(api.ServiceDefaults, "defaults", queryOpts)
@@ -366,7 +366,7 @@ func TestControllerNamespaces(t *testing.T) {
 				logger.Log(t, "deleting terminating-gateway custom resource")
 				k8s.RunKubectl(t, ctx.KubectlOptions(t), "delete", "-n", KubeNS, "terminatinggateway", "terminating-gateway")
 
-				counter := &retry.Counter{Count: 10, Wait: 500 * time.Millisecond}
+				counter := &retry.Counter{Count: 20, Wait: 2 * time.Second}
 				retry.RunWith(counter, t, func(r *retry.R) {
 					// service-defaults
 					_, _, err := consulClient.ConfigEntries().Get(api.ServiceDefaults, "defaults", queryOpts)
diff --git a/acceptance/tests/config-entries/config_entries_test.go b/acceptance/tests/config-entries/config_entries_test.go
index d3c0d410a0..4aa7cf11bd 100644
--- a/acceptance/tests/config-entries/config_entries_test.go
+++ b/acceptance/tests/config-entries/config_entries_test.go
@@ -96,7 +96,7 @@ func TestController(t *testing.T) {
 				// On startup, the controller can take upwards of 1m to perform
 				// leader election so we may need to wait a long time for
 				// the reconcile loop to run (hence the 1m timeout here).
-				counter := &retry.Counter{Count: 60, Wait: 1 * time.Second}
+				counter := &retry.Counter{Count: 60, Wait: 2 * time.Second}
 				retry.RunWith(counter, t, func(r *retry.R) {
 					// service-defaults
 					entry, _, err := consulClient.ConfigEntries().Get(api.ServiceDefaults, "defaults", nil)
diff --git a/acceptance/tests/consul-dns/consul_dns_test.go b/acceptance/tests/consul-dns/consul_dns_test.go
index 15b7d580be..c33de7747d 100644
--- a/acceptance/tests/consul-dns/consul_dns_test.go
+++ b/acceptance/tests/consul-dns/consul_dns_test.go
@@ -62,7 +62,7 @@ func TestConsulDNS(t *testing.T) {
 
 			dnsPodName := fmt.Sprintf("%s-dns-pod", releaseName)
 			dnsTestPodArgs := []string{
-				"run", "-i", dnsPodName, "--restart", "Never", "--image", "anubhavmishra/tiny-tools", "--", "dig", fmt.Sprintf("@%s-consul-dns", releaseName), "consul.service.consul",
+				"run", "-it", dnsPodName, "--restart", "Never", "--image", "anubhavmishra/tiny-tools", "--", "dig", fmt.Sprintf("@%s-consul-dns", releaseName), "consul.service.consul",
 			}
 
 			helpers.Cleanup(t, suite.Config().NoCleanupOnFailure, func() {
diff --git a/acceptance/tests/metrics/metrics_test.go b/acceptance/tests/metrics/metrics_test.go
index acfe465b00..2a130f38db 100644
--- a/acceptance/tests/metrics/metrics_test.go
+++ b/acceptance/tests/metrics/metrics_test.go
@@ -132,7 +132,7 @@ func TestAppMetrics(t *testing.T) {
 
 	// Retry because sometimes the merged metrics server takes a couple hundred milliseconds
 	// to start.
-	retry.RunWith(&retry.Counter{Count: 3, Wait: 1 * time.Second}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Counter{Count: 20, Wait: 2 * time.Second}, t, func(r *retry.R) {
 		metricsOutput, err := k8s.RunKubectlAndGetOutputE(t, ctx.KubectlOptions(t), "exec", "deploy/"+StaticClientName, "--", "curl", "--silent", "--show-error", fmt.Sprintf("http://%s:20200/metrics", podIP))
 		require.NoError(r, err)
 		// This assertion represents the metrics from the envoy sidecar.
diff --git a/acceptance/tests/partitions/partitions_sync_test.go b/acceptance/tests/partitions/partitions_sync_test.go
index 344d64a780..cf32c97ae3 100644
--- a/acceptance/tests/partitions/partitions_sync_test.go
+++ b/acceptance/tests/partitions/partitions_sync_test.go
@@ -248,7 +248,7 @@ func TestPartitions_Sync(t *testing.T) {
 
 			logger.Log(t, "checking that the service has been synced to Consul")
 			var services map[string][]string
-			counter := &retry.Counter{Count: 20, Wait: 30 * time.Second}
+			counter := &retry.Counter{Count: 30, Wait: 30 * time.Second}
 			retry.RunWith(counter, t, func(r *retry.R) {
 				var err error
 				// list services in default partition catalog.
diff --git a/charts/consul/test/terraform/aks/main.tf b/charts/consul/test/terraform/aks/main.tf
index d077471ec9..8cf72a142c 100644
--- a/charts/consul/test/terraform/aks/main.tf
+++ b/charts/consul/test/terraform/aks/main.tf
@@ -71,7 +71,7 @@ resource "azurerm_kubernetes_cluster" "default" {
   default_node_pool {
     name            = "default"
     node_count      = 3
-    vm_size         = "Standard_D2_v2"
+    vm_size         = "Standard_D3_v2"
     os_disk_size_gb = 30
     vnet_subnet_id  = azurerm_virtual_network.default[count.index].subnet.*.id[0]
   }
diff --git a/charts/consul/test/terraform/eks/main.tf b/charts/consul/test/terraform/eks/main.tf
index 07c58a2705..6301202161 100644
--- a/charts/consul/test/terraform/eks/main.tf
+++ b/charts/consul/test/terraform/eks/main.tf
@@ -73,7 +73,7 @@ module "eks" {
       max_capacity     = 3
       min_capacity     = 3
 
-      instance_type = "m5.large"
+      instance_type = "m5.xlarge"
     }
   }
 
diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf
index f8ff19b912..98a063d450 100644
--- a/charts/consul/test/terraform/gke/main.tf
+++ b/charts/consul/test/terraform/gke/main.tf
@@ -3,7 +3,8 @@
 
 provider "google" {
   project = var.project
-  version = "~> 3.49.0"
+  version = "~> 4.58.0"
+  zone    = var.zone
 }
 
 resource "random_id" "suffix" {
@@ -16,6 +17,11 @@ data "google_container_engine_versions" "main" {
   version_prefix = "1.25."
 }
 
+# We assume that the subnets are already created to save time.
+data "google_compute_subnetwork" "subnet" {
+  name = var.subnet
+}
+
 resource "google_container_cluster" "cluster" {
   provider = "google"
   count    = var.cluster_count
@@ -28,8 +34,9 @@ resource "google_container_cluster" "cluster" {
   node_version       = data.google_container_engine_versions.main.latest_master_version
   node_config {
     tags         = ["consul-k8s-${random_id.suffix[count.index].dec}"]
-    machine_type = "e2-standard-4"
+    machine_type = "e2-standard-8"
   }
+  subnetwork      = data.google_compute_subnetwork.subnet.name
   resource_labels = var.labels
 }
 
diff --git a/charts/consul/test/terraform/gke/variables.tf b/charts/consul/test/terraform/gke/variables.tf
index 1eebe64145..f33952850a 100644
--- a/charts/consul/test/terraform/gke/variables.tf
+++ b/charts/consul/test/terraform/gke/variables.tf
@@ -37,3 +37,9 @@ variable "labels" {
   default     = {}
   description = "Labels to attach to the created resources."
 }
+
+variable "subnet" {
+  type        = string
+  default     = "default"
+  description = "Subnet to create the cluster in. Currently all clusters use the default subnet and we are running out of IPs"
+}
diff --git a/control-plane/subcommand/connect-init/command_test.go b/control-plane/subcommand/connect-init/command_test.go
index 69abc8f1ad..cb1d32d03b 100644
--- a/control-plane/subcommand/connect-init/command_test.go
+++ b/control-plane/subcommand/connect-init/command_test.go
@@ -615,7 +615,7 @@ func TestRun_Gateways_Errors(t *testing.T) {
 				"-pod-name", testPodName,
 				"-pod-namespace", testPodNamespace,
 				"-proxy-id-file", proxyFile,
-				"-consul-api-timeout", "5s",
+				"-consul-api-timeout", "10s",
 				"-consul-node-name", nodeName,
 			}
 
@@ -729,7 +729,7 @@ func TestRun_InvalidProxyFile(t *testing.T) {
 		"-http-port", strconv.Itoa(serverCfg.Ports.HTTP),
 		"-grpc-port", strconv.Itoa(serverCfg.Ports.GRPC),
 		"-proxy-id-file", randFileName,
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	}
 	code := cmd.Run(flags)
 	require.Equal(t, 1, code)
diff --git a/control-plane/subcommand/consul-logout/command_test.go b/control-plane/subcommand/consul-logout/command_test.go
index e7e3a00f38..1a0744996a 100644
--- a/control-plane/subcommand/consul-logout/command_test.go
+++ b/control-plane/subcommand/consul-logout/command_test.go
@@ -54,7 +54,7 @@ func TestRun_InvalidSinkFile(t *testing.T) {
 	}
 	code := cmd.Run([]string{
 		"-token-file", randFileName,
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, code)
 }
@@ -107,7 +107,7 @@ func Test_UnableToLogoutDueToInvalidToken(t *testing.T) {
 	code := cmd.Run([]string{
 		"-http-addr", fmt.Sprintf("%s://%s", cfg.Scheme, cfg.Address),
 		"-token-file", tokenFile,
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, code, ui.ErrorWriter.String())
 	require.Contains(t, "Unexpected response code: 403 (ACL not found)", ui.ErrorWriter.String())
@@ -172,7 +172,7 @@ func Test_RunUsingLogin(t *testing.T) {
 	code := cmd.Run([]string{
 		"-http-addr", fmt.Sprintf("%s://%s", cfg.Scheme, cfg.Address),
 		"-token-file", tokenFile,
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, code, ui.ErrorWriter.String())
 
diff --git a/control-plane/subcommand/create-federation-secret/command_test.go b/control-plane/subcommand/create-federation-secret/command_test.go
index a90ff692e2..c401f1fc7e 100644
--- a/control-plane/subcommand/create-federation-secret/command_test.go
+++ b/control-plane/subcommand/create-federation-secret/command_test.go
@@ -80,7 +80,7 @@ func TestRun_FlagValidation(t *testing.T) {
 				"-server-ca-key-file=file",
 				"-ca-file", f.Name(),
 				"-mesh-gateway-service-name=name",
-				"-consul-api-timeout=5s",
+				"-consul-api-timeout=10s",
 				"-log-level=invalid",
 			},
 			expErr: "unknown log level: invalid",
@@ -117,7 +117,7 @@ func TestRun_CAFileMissing(t *testing.T) {
 		"-server-ca-cert-file", f.Name(),
 		"-server-ca-key-file", f.Name(),
 		"-ca-file=/this/does/not/exist",
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 	require.Contains(t, ui.ErrorWriter.String(), "error reading CA file")
@@ -140,7 +140,7 @@ func TestRun_ServerCACertFileMissing(t *testing.T) {
 		"-ca-file", f.Name(),
 		"-server-ca-cert-file=/this/does/not/exist",
 		"-server-ca-key-file", f.Name(),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 	require.Contains(t, ui.ErrorWriter.String(), "Error reading server CA cert file")
@@ -163,7 +163,7 @@ func TestRun_ServerCAKeyFileMissing(t *testing.T) {
 		"-ca-file", f.Name(),
 		"-server-ca-cert-file", f.Name(),
 		"-server-ca-key-file=/this/does/not/exist",
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 	require.Contains(t, ui.ErrorWriter.String(), "Error reading server CA key file")
@@ -187,7 +187,7 @@ func TestRun_GossipEncryptionKeyFileMissing(t *testing.T) {
 		"-server-ca-cert-file", f.Name(),
 		"-server-ca-key-file", f.Name(),
 		"-gossip-key-file=/this/does/not/exist",
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 	require.Contains(t, ui.ErrorWriter.String(), "Error reading gossip encryption key file")
@@ -211,7 +211,7 @@ func TestRun_GossipEncryptionKeyFileEmpty(t *testing.T) {
 		"-server-ca-cert-file", f.Name(),
 		"-server-ca-key-file", f.Name(),
 		"-gossip-key-file", f.Name(),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 	require.Contains(t, ui.ErrorWriter.String(), fmt.Sprintf("gossip key file %q was empty", f.Name()))
@@ -249,7 +249,7 @@ func TestRun_ReplicationTokenMissingExpectedKey(t *testing.T) {
 		"-server-ca-cert-file", f.Name(),
 		"-server-ca-key-file", f.Name(),
 		"-export-replication-token",
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 }
@@ -448,7 +448,7 @@ func TestRun_ACLs_K8SNamespaces_ResourcePrefixes(tt *testing.T) {
 				"-server-ca-cert-file", caFile,
 				"-server-ca-key-file", keyFile,
 				"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-				"-consul-api-timeout", "5s",
+				"-consul-api-timeout", "10s",
 			}
 			if c.aclsEnabled {
 				flags = append(flags, "-export-replication-token")
@@ -555,7 +555,7 @@ func TestRun_WaitsForMeshGatewayInstances(t *testing.T) {
 		"-server-ca-cert-file", certFile,
 		"-server-ca-key-file", keyFile,
 		"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
@@ -609,7 +609,7 @@ func TestRun_MeshGatewayNoWANAddr(t *testing.T) {
 		"-server-ca-cert-file", caFile,
 		"-server-ca-key-file", keyFile,
 		"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 1, exitCode, ui.ErrorWriter.String())
 }
@@ -695,7 +695,7 @@ func TestRun_MeshGatewayUniqueAddrs(tt *testing.T) {
 				"-server-ca-cert-file", caFile,
 				"-server-ca-key-file", keyFile,
 				"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-				"-consul-api-timeout", "5s",
+				"-consul-api-timeout", "10s",
 			})
 			require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
@@ -838,7 +838,7 @@ func TestRun_ReplicationSecretDelay(t *testing.T) {
 		"-server-ca-key-file", keyFile,
 		"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
 		"-export-replication-token",
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	}
 	exitCode := cmd.Run(flags)
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
@@ -908,7 +908,7 @@ func TestRun_UpdatesSecret(t *testing.T) {
 			"-server-ca-cert-file", certFile,
 			"-server-ca-key-file", keyFile,
 			"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-			"-consul-api-timeout", "5s",
+			"-consul-api-timeout", "10s",
 		})
 		require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
@@ -950,7 +950,7 @@ func TestRun_UpdatesSecret(t *testing.T) {
 			"-server-ca-cert-file", caFile,
 			"-server-ca-key-file", keyFile,
 			"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-			"-consul-api-timeout", "5s",
+			"-consul-api-timeout", "10s",
 		})
 		require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
@@ -1044,7 +1044,7 @@ func TestRun_ConsulClientDelay(t *testing.T) {
 		"-server-ca-cert-file", caFile,
 		"-server-ca-key-file", keyFile,
 		"-http-addr", fmt.Sprintf("https://127.0.0.1:%d", randomPorts[2]),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	}
 	exitCode := cmd.Run(flags)
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
@@ -1112,7 +1112,7 @@ func TestRun_Autoencrypt(t *testing.T) {
 		"-server-ca-cert-file", keyFile,
 		"-server-ca-key-file", keyFile,
 		"-http-addr", fmt.Sprintf("https://%s", a.HTTPSAddr),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
diff --git a/control-plane/subcommand/get-consul-client-ca/command_test.go b/control-plane/subcommand/get-consul-client-ca/command_test.go
index 466e11a11e..95ff4dbfbb 100644
--- a/control-plane/subcommand/get-consul-client-ca/command_test.go
+++ b/control-plane/subcommand/get-consul-client-ca/command_test.go
@@ -51,7 +51,7 @@ func TestRun_FlagsValidation(t *testing.T) {
 			flags: []string{
 				"-output-file=output.pem",
 				"-server-addr=foo.com",
-				"-consul-api-timeout=5s",
+				"-consul-api-timeout=10s",
 				"-log-level=invalid-log-level",
 			},
 			expErr: "unknown log level: invalid-log-level",
@@ -106,7 +106,7 @@ func TestRun(t *testing.T) {
 		"-server-port", strings.Split(a.HTTPSAddr, ":")[1],
 		"-ca-file", caFile,
 		"-output-file", outputFile.Name(),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())
 
@@ -189,7 +189,7 @@ func TestRun_ConsulServerAvailableLater(t *testing.T) {
 		"-server-port", fmt.Sprintf("%d", randomPorts[2]),
 		"-ca-file", caFile,
 		"-output-file", outputFile.Name(),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode, ui.ErrorWriter)
 
@@ -280,7 +280,7 @@ func TestRun_GetsOnlyActiveRoot(t *testing.T) {
 		"-server-port", strings.Split(a.HTTPSAddr, ":")[1],
 		"-ca-file", caFile,
 		"-output-file", outputFile.Name(),
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode)
 
@@ -348,7 +348,7 @@ func TestRun_WithProvider(t *testing.T) {
 		"-server-port", strings.Split(a.HTTPSAddr, ":")[1],
 		"-output-file", outputFile.Name(),
 		"-ca-file", caFile,
-		"-consul-api-timeout", "5s",
+		"-consul-api-timeout", "10s",
 	})
 	require.Equal(t, 0, exitCode, ui.ErrorWriter.String())