diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml
index 5989d3286..9ca590993 100644
--- a/.github/workflows/clone-staging.yaml
+++ b/.github/workflows/clone-staging.yaml
@@ -18,30 +18,30 @@ jobs:
   clone-database:
     runs-on: ubuntu-latest
     env:
-      CF_USERNAME: CF_MS_USERNAME
-      CF_PASSWORD: CF_MS_PASSWORD
+      CF_USERNAME: ${{ secrets.CF_MS_USERNAME }}
+      CF_PASSWORD: ${{ secrets.CF_MS_PASSWORD }}
     steps:
         - name: Clone Database
           run: |
-            # install cf cli
+            # install cf cli and other tools
             wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg
             echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
             
             sudo apt-get update
-            sudo apt-get install cf8-cli
+            sudo apt-get install cf8-cli postgresql-client-common
             # install cg-manage-rds tool
             pip install git+https://github.com/cloud-gov/cg-manage-rds.git
             
             # Authenticate and target CF org and space.
             cf api api.fr.cloud.gov
-            cf auth ${{ secrets[env.CF_USERNAME] }} ${{ secrets[env.CF_PASSWORD] }}
-            cf target -o cisa-dotgov -s ${{ env.DESTINATION_ENVIRONMENT }}
+            cf auth "$CF_USERNAME" "$CF_PASSWORD"
+            cf target -o cisa-dotgov -s $DESTINATION_ENVIRONMENT
             
             # share the target db with the source space
-            cf share-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+            cf share-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
             
             # clone from source to destination
-            cg-manage-rds clone getgov-${{ env.DESTINATION_ENVIRONMENT }}-database getgov-${{ env.SOURCE_ENVIRONMENT }}-database
+            cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database
             
             # unshare the service
-            cf unshare-service getgov-${{ env.DESTINATION_ENVIRONMENT }}-database -s ${{ env.SOURCE_ENVIRONMENT }}
+            cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 5b7604222..5142131af 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -23,7 +23,7 @@
                         </svg>
                         Reset
                     </button>
-                    <label class="usa-sr-only" for="domain-requests__search-field">
+                    <label id="domain-requests__search-label" class="usa-sr-only" for="domain-requests__search-field">
                         {% if portfolio %}
                             Search by domain name or creator
                         {% else %}
@@ -41,7 +41,7 @@
                         placeholder="Search by domain name"
                         {% endif %}
                     />
-                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit">
+                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit" aria-labelledby="domain-requests__search-label">
                         <img
                             src="{% static 'img/usa-icons-bg/search--white.svg' %}"
                             class="usa-search__submit-icon"
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 731249a3e..0a04af8ca 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -23,7 +23,7 @@
             </svg>
             Reset
           </button>
-          <label class="usa-sr-only" for="domains__search-field">Search by domain name</label>
+          <label id="domains__search-label" class="usa-sr-only" for="domains__search-field">Search by domain name</label>
           <input
             class="usa-input"
             id="domains__search-field"
@@ -31,7 +31,7 @@
             name="domains-search"
             placeholder="Search by domain name"
           />
-          <button class="usa-button" type="submit" id="domains__search-field-submit">
+          <button class="usa-button" type="submit" id="domains__search-field-submit" aria-labelledby="domains__search-label">
             <img
               src="{% static 'img/usa-icons-bg/search--white.svg' %}"
               class="usa-search__submit-icon"