diff --git a/.github/workflows/ci-bats-macos.yaml b/.github/workflows/ci-bats-macos.yaml
index a365c8e516..7203d47a38 100644
--- a/.github/workflows/ci-bats-macos.yaml
+++ b/.github/workflows/ci-bats-macos.yaml
@@ -85,9 +85,9 @@ jobs:
       - name: Install Maven
         working-directory: ./.ci_bin
         run: |
-          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
-          tar -xf apache-maven-3.9.4-bin.tar.gz
-          echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
+          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+          tar -xf apache-maven-3.9.9-bin.tar.gz
+          echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
       - name: Install Hadoop
         working-directory: ./.ci_bin
         run: |
diff --git a/.github/workflows/ci-bats-unix-remote.yaml b/.github/workflows/ci-bats-unix-remote.yaml
index 4dbe2c659b..43df98f649 100644
--- a/.github/workflows/ci-bats-unix-remote.yaml
+++ b/.github/workflows/ci-bats-unix-remote.yaml
@@ -78,9 +78,9 @@ jobs:
         if: ${{ env.use_credentials != 'true' }}
         working-directory: ./.ci_bin
         run: |
-          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
-          tar -xf apache-maven-3.9.4-bin.tar.gz
-          echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
+          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+          tar -xf apache-maven-3.9.9-bin.tar.gz
+          echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
       - name: Install Hadoop
         if: ${{ env.use_credentials != 'true' }}
         working-directory: ./.ci_bin
diff --git a/.github/workflows/ci-bats-unix.yaml b/.github/workflows/ci-bats-unix.yaml
index b2cdc65db2..659564dc5d 100644
--- a/.github/workflows/ci-bats-unix.yaml
+++ b/.github/workflows/ci-bats-unix.yaml
@@ -91,9 +91,9 @@ jobs:
       - name: Install Maven
         working-directory: ./.ci_bin
         run: |
-          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
-          tar -xf apache-maven-3.9.4-bin.tar.gz
-          echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
+          curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+          tar -xf apache-maven-3.9.9-bin.tar.gz
+          echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
       - name: Install Hadoop
         working-directory: ./.ci_bin
         run: |
diff --git a/integration-tests/ORMDockerfile b/integration-tests/ORMDockerfile
index c200cf1ffa..366ad7ccaf 100644
--- a/integration-tests/ORMDockerfile
+++ b/integration-tests/ORMDockerfile
@@ -42,14 +42,14 @@ RUN pip3 install mysql-connector-python PyMySQL sqlalchemy
 # Setup JAVA_HOME -- useful for docker commandline
 ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64/
 
-# install the current latest maven version, `v3.9.4`, because apt installed one does not work with jdk 17
-ADD https://apache.osuosl.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz apache-maven-3.9.4-bin.tar.gz
-RUN tar zxvf apache-maven-3.9.4-bin.tar.gz && \
-    cp -r apache-maven-3.9.4 /opt && \
-    rm -rf apache-maven-3.9.4 apache-maven-3.9.4-bin.tar.gz
+# install the current latest maven version, `v3.9.9`, because apt installed one does not work with jdk 17
+ADD https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz apache-maven-3.9.9-bin.tar.gz
+RUN tar zxvf apache-maven-3.9.9-bin.tar.gz && \
+    cp -r apache-maven-3.9.9 /opt && \
+    rm -rf apache-maven-3.9.9 apache-maven-3.9.9-bin.tar.gz
 
 # add maven binary
-ENV PATH /opt/apache-maven-3.9.4/bin:$PATH
+ENV PATH /opt/apache-maven-3.9.9/bin:$PATH
 
 # install dolt from source
 WORKDIR /root/building
diff --git a/integration-tests/orm-tests/orm-tests.bats b/integration-tests/orm-tests/orm-tests.bats
index d632a5bff3..924ec57a20 100644
--- a/integration-tests/orm-tests/orm-tests.bats
+++ b/integration-tests/orm-tests/orm-tests.bats
@@ -6,7 +6,8 @@ setup() {
   cd $REPO_NAME
 
   USER="dolt"
-  dolt sql-server --host 0.0.0.0 --user=$USER --loglevel=trace &
+  dolt sql -q "CREATE USER dolt@'%'; GRANT ALL ON *.* TO dolt@'%';"
+  dolt sql-server --host 0.0.0.0 --loglevel=trace &
   SERVER_PID=$!
 
   # Give the server a chance to start