diff --git a/.github/workflows/ci-backend-cql-dummy.yml b/.github/workflows/ci-backend-cql-dummy.yml
index d271793ee76..86cc4371d7d 100644
--- a/.github/workflows/ci-backend-cql-dummy.yml
+++ b/.github/workflows/ci-backend-cql-dummy.yml
@@ -17,12 +17,12 @@ name: CI Backend CQL
 on:
   pull_request:
     paths:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
 
 jobs:
   tests:
@@ -33,164 +33,90 @@ jobs:
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
             name: byteordered-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
-            name: murmur-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
-            name: byteordered-graphdb
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
-            name: murmur-graphdb
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
-            name: murmur-hadoop
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
-            name: byteordered-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
-            name: murmur-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-ssl
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-client-auth
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
-            name: scylladb-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
-            name: scylladb-graphdb
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/hadoop/*\""
-            name: scylladb-hadoop
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/core/cql/*\""
-            name: scylladb-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
-            name: byteordered-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
             name: byteordered-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
             name: byteordered-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-ssl
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-client-auth
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
             name: scylladb-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
             name: scylladb-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/hadoop/*\""
             name: scylladb-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/core/cql/*\""
             name: scylladb-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
             name: byteordered-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
             name: byteordered-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
             name: byteordered-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-ssl
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-client-auth
-            install-args: "-Pjava-11"
             java: 11
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-backend-cql.yml b/.github/workflows/ci-backend-cql.yml
index 8505798871b..b9b693b96b1 100644
--- a/.github/workflows/ci-backend-cql.yml
+++ b/.github/workflows/ci-backend-cql.yml
@@ -17,20 +17,20 @@ name: CI Backend CQL
 on:
   pull_request:
     paths-ignore:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
   push:
     paths-ignore:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
     branches-ignore:
       - 'dependabot/**'
 
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -66,164 +66,90 @@ jobs:
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
             name: byteordered-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
-            name: murmur-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
-            name: byteordered-graphdb
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
-            name: murmur-graphdb
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
-            name: murmur-hadoop
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
-            name: byteordered-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
-            name: murmur-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-ssl
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-client-auth
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
-            name: scylladb-diskstorage
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
-            name: scylladb-graphdb
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/hadoop/*\""
-            name: scylladb-hadoop
-            java: 8
-          - module: cql
-            args: "-Pscylladb -Dtest=\"**/core/cql/*\""
-            name: scylladb-core
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
-            name: byteordered-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
             name: byteordered-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
             name: byteordered-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-ssl
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-client-auth
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
             name: scylladb-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
             name: scylladb-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/hadoop/*\""
             name: scylladb-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pscylladb -Dtest=\"**/core/cql/*\""
             name: scylladb-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
             name: byteordered-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
             name: byteordered-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
             name: byteordered-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-ssl
-            install-args: "-Pjava-11"
             java: 11
           - module: cql
             args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-client-auth
-            install-args: "-Pjava-11"
             java: 11
     steps:
       - uses: actions/checkout@v4
@@ -286,7 +212,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-${{ matrix.module }} ${{ env.BUILD_MAVEN_OPTS }} ${{ matrix.install-args }}
       - run: mvn verify --projects janusgraph-${{ matrix.module }} -Dcassandra.docker.version='3.0.18' ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }}
diff --git a/.github/workflows/ci-backend-hbase-dummy.yml b/.github/workflows/ci-backend-hbase-dummy.yml
index a8909672e69..355da21f5fb 100644
--- a/.github/workflows/ci-backend-hbase-dummy.yml
+++ b/.github/workflows/ci-backend-hbase-dummy.yml
@@ -31,29 +31,14 @@ jobs:
       matrix:
         include:
           - module: hbase
-            args: "-Dtest=\"**/diskstorage/hbase/*\""
-            name: hbase2-diskstorage
-            java: 8
-          - module: hbase
-            args: "-Dtest=\"**/graphdb/hbase/*\""
-            name: hbase2-graphdb
-            java: 8
-          - module: hbase
-            args: "-Dtest=\"**/hadoop/*\""
-            name: hbase2-hadoop
-            java: 8
-          - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/diskstorage/hbase/*\""
             name: hbase2-diskstorage
             java: 11
           - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/graphdb/hbase/*\""
             name: hbase2-graphdb
             java: 11
           - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/hadoop/*\""
             name: hbase2-hadoop
             java: 11
diff --git a/.github/workflows/ci-backend-hbase.yml b/.github/workflows/ci-backend-hbase.yml
index d2ee26e2cbe..32a71af50f2 100644
--- a/.github/workflows/ci-backend-hbase.yml
+++ b/.github/workflows/ci-backend-hbase.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -64,29 +64,14 @@ jobs:
       matrix:
         include:
           - module: hbase
-            args: "-Dtest=\"**/diskstorage/hbase/*\""
-            name: hbase2-diskstorage
-            java: 8
-          - module: hbase
-            args: "-Dtest=\"**/graphdb/hbase/*\""
-            name: hbase2-graphdb
-            java: 8
-          - module: hbase
-            args: "-Dtest=\"**/hadoop/*\""
-            name: hbase2-hadoop
-            java: 8
-          - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/diskstorage/hbase/*\""
             name: hbase2-diskstorage
             java: 11
           - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/graphdb/hbase/*\""
             name: hbase2-graphdb
             java: 11
           - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest=\"**/hadoop/*\""
             name: hbase2-hadoop
             java: 11
diff --git a/.github/workflows/ci-backend-scylla-dummy.yml b/.github/workflows/ci-backend-scylla-dummy.yml
index 74ec208e530..d0ca020abdc 100644
--- a/.github/workflows/ci-backend-scylla-dummy.yml
+++ b/.github/workflows/ci-backend-scylla-dummy.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -66,56 +66,26 @@ jobs:
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\""
-            name: murmur-graphdb
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\""
-            name: murmur-hadoop
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\""
-            name: murmur-core
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-ssl
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-            name: murmur-client-auth
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\""
-            name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-ssl
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
             name: murmur-client-auth
-            install-args: "-Pjava-11"
             java: 11
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-backend-scylla.yml b/.github/workflows/ci-backend-scylla.yml
index 0a0fbdd314c..904c79f3144 100644
--- a/.github/workflows/ci-backend-scylla.yml
+++ b/.github/workflows/ci-backend-scylla.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -66,60 +66,28 @@ jobs:
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\""
             name: murmur-diskstorage
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\""
-            name: murmur-graphdb
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\""
-            name: murmur-hadoop
-            java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\""
-            name: murmur-core
-            java: 8
-        # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595
-        #  - module: scylla
-        #    args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-        #    name: murmur-ssl
-        #    java: 8
-        # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595
-        #  - module: scylla
-        #    args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
-        #    name: murmur-client-auth
-        #    java: 8
-          - module: scylla
-            args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\""
-            name: murmur-diskstorage
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\""
             name: murmur-graphdb
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\""
             name: murmur-hadoop
-            install-args: "-Pjava-11"
             java: 11
           - module: scylla
             args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\""
             name: murmur-core
-            install-args: "-Pjava-11"
             java: 11
         # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595
         #  - module: scylla
         #    args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
         #    name: murmur-ssl
-        #    install-args: "-Pjava-11"
         #    java: 11
         # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595
         #  - module: scylla
         #    args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
         #    name: murmur-client-auth
-        #    install-args: "-Pjava-11"
         #    java: 11
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/ci-benchmark.yml b/.github/workflows/ci-benchmark.yml
index ab6d0537afc..442d2b97973 100644
--- a/.github/workflows/ci-benchmark.yml
+++ b/.github/workflows/ci-benchmark.yml
@@ -44,7 +44,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -68,7 +68,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install -Pjanusgraph-benchmark ${{ env.BUILD_MAVEN_OPTS }} -Dgpg.skip=true
       - run: mvn verify --projects janusgraph-benchmark
diff --git a/.github/workflows/ci-core-dummy.yml b/.github/workflows/ci-core-dummy.yml
index cab6e3dfb22..2d6296f6095 100644
--- a/.github/workflows/ci-core-dummy.yml
+++ b/.github/workflows/ci-core-dummy.yml
@@ -41,36 +41,17 @@ jobs:
       matrix:
         include:
           - module: driver
-            java: 8
-          - module: server
-            java: 8
-          - module: test
-            java: 8
-          - module: inmemory
-            args: "-Dtest.skip.tp=false"
-            java: 8
-          - module: berkeleyje
-            java: 8
-          - module: lucene
-            java: 8
-          - module: driver
-            install-args: "-Pjava-11"
             java: 11
           - module: server
-            install-args: "-Pjava-11"
             java: 11
           - module: test
-            install-args: "-Pjava-11"
             java: 11
           - module: inmemory
-            install-args: "-Pjava-11"
             args: "-Dtest.skip.tp=false"
             java: 11
           - module: berkeleyje
-            install-args: "-Pjava-11"
             java: 11
           - module: lucene
-            install-args: "-Pjava-11"
             java: 11
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index c45c188411d..ef1f5f84478 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -50,29 +50,11 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
 
-  build-java11:
-    needs: build-all
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: zulu
-      - run: mvn clean install --projects janusgraph-all -Pjava-11 -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
-      - run: mvn verify --projects janusgraph-all -Pjava-11 -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
-
   tests:
     runs-on: ubuntu-22.04
     needs: build-all
@@ -81,36 +63,17 @@ jobs:
       matrix:
         include:
           - module: driver
-            java: 8
-          - module: server
-            java: 8
-          - module: test
-            java: 8
-          - module: inmemory
-            args: "-Dtest.skip.tp=false"
-            java: 8
-          - module: berkeleyje
-            java: 8
-          - module: lucene
-            java: 8
-          - module: driver
-            install-args: "-Pjava-11"
             java: 11
           - module: server
-            install-args: "-Pjava-11"
             java: 11
           - module: test
-            install-args: "-Pjava-11"
             java: 11
           - module: inmemory
-            install-args: "-Pjava-11"
             args: "-Dtest.skip.tp=false"
             java: 11
           - module: berkeleyje
-            install-args: "-Pjava-11"
             java: 11
           - module: lucene
-            install-args: "-Pjava-11"
             java: 11
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
index 14d8a44b01e..9959b033fec 100644
--- a/.github/workflows/ci-docs.yml
+++ b/.github/workflows/ci-docs.yml
@@ -38,7 +38,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -58,7 +58,7 @@ jobs:
         with:
           java-version: 11
           distribution: zulu
-      - run: mvn clean install -Pjava-11 -pl janusgraph-doc ${{ env.BUILD_MAVEN_OPTS }}
+      - run: mvn clean install -pl janusgraph-doc ${{ env.BUILD_MAVEN_OPTS }}
       - run: git diff  --exit-code docs/configs/janusgraph-cfg.md
       - run: docker build -t doc-site:mkdocs -f docs.Dockerfile .
       - run: docker run --rm -v $PWD:/mkdocs doc-site:mkdocs mkdocs build
diff --git a/.github/workflows/ci-index-es-dummy.yml b/.github/workflows/ci-index-es-dummy.yml
index e88f4a485df..24846cdd695 100644
--- a/.github/workflows/ci-index-es-dummy.yml
+++ b/.github/workflows/ci-index-es-dummy.yml
@@ -31,38 +31,18 @@ jobs:
       matrix:
         include:
           - module: es
-            args: "-Pelasticsearch8"
-            name: es8
-            java: 8
-          - module: es
-            args: "-Pelasticsearch7"
-            name: es7
-            java: 8
-          - module: es
-            args: "-Pelasticsearch6"
-            name: es6
-            java: 8
-          - module: es
-            args: "-Pelasticsearch60"
-            name: es60
-            java: 8
-          - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch8"
             name: es8
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch7"
             name: es7
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch6"
             name: es6
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch60"
             name: es60
             java: 11
diff --git a/.github/workflows/ci-index-es.yml b/.github/workflows/ci-index-es.yml
index 5ef7cc2ffac..4018cb307f1 100644
--- a/.github/workflows/ci-index-es.yml
+++ b/.github/workflows/ci-index-es.yml
@@ -52,7 +52,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -65,38 +65,18 @@ jobs:
       matrix:
         include:
           - module: es
-            args: "-Pelasticsearch8"
-            name: es8
-            java: 8
-          - module: es
-            args: "-Pelasticsearch7"
-            name: es7
-            java: 8
-          - module: es
-            args: "-Pelasticsearch6"
-            name: es6
-            java: 8
-          - module: es
-            args: "-Pelasticsearch60"
-            name: es60
-            java: 8
-          - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch8"
             name: es8
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch7"
             name: es7
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch6"
             name: es6
             java: 11
           - module: es
-            install-args: "-Pjava-11"
             args: "-Pelasticsearch60"
             name: es60
             java: 11
diff --git a/.github/workflows/ci-index-solr-dummy.yml b/.github/workflows/ci-index-solr-dummy.yml
index 9ca53108d4c..bd514401c40 100644
--- a/.github/workflows/ci-index-solr-dummy.yml
+++ b/.github/workflows/ci-index-solr-dummy.yml
@@ -31,11 +31,6 @@ jobs:
       matrix:
         include:
           - module: solr
-            args: "-Psolr8"
-            name: solr8
-            java: 8
-          - module: solr
-            install-args: "-Pjava-11"
             args: "-Psolr8"
             name: solr8
             java: 11
diff --git a/.github/workflows/ci-index-solr.yml b/.github/workflows/ci-index-solr.yml
index 0c06ad10bd9..86812a0a0c4 100644
--- a/.github/workflows/ci-index-solr.yml
+++ b/.github/workflows/ci-index-solr.yml
@@ -52,7 +52,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -65,11 +65,6 @@ jobs:
       matrix:
         include:
           - module: solr
-            args: "-Psolr8"
-            name: solr8
-            java: 8
-          - module: solr
-            install-args: "-Pjava-11"
             args: "-Psolr8"
             name: solr8
             java: 11
diff --git a/.github/workflows/ci-publish-commit.yml b/.github/workflows/ci-publish-commit.yml
index 80230bb8c39..8baaabf7adf 100644
--- a/.github/workflows/ci-publish-commit.yml
+++ b/.github/workflows/ci-publish-commit.yml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: "8.0.382+5"
+          java-version: "11.0.21+9"
           java-package: jdk
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/ci-publish-official.yml b/.github/workflows/ci-publish-official.yml
index 6595668a218..1b1e30990ec 100644
--- a/.github/workflows/ci-publish-official.yml
+++ b/.github/workflows/ci-publish-official.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: "8.0.382+5"
+          java-version: "11.0.21+9"
           java-package: jdk
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/ci-release-dummy.yml b/.github/workflows/ci-release-dummy.yml
index 9f4b96dcf6d..5f79cb1d985 100644
--- a/.github/workflows/ci-release-dummy.yml
+++ b/.github/workflows/ci-release-dummy.yml
@@ -31,8 +31,6 @@ jobs:
       matrix:
         include:
           - args: ""
-            java: 8
-          - args: "-Pjava-11"
             java: 11
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index b22a97093bc..0dfd66ffbae 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -54,7 +54,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: "8.0.382+5"
+          java-version: "11.0.21+9"
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -67,11 +67,8 @@ jobs:
       matrix:
         include:
           - args: ""
-            java: 8
+            java: "11.0.21+9"
             tag_suffix: ""
-          - args: "-Pjava-11"
-            java: 11
-            tag_suffix: "-java-11"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v3
@@ -80,11 +77,6 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v3
-        if: "matrix.java == 8"
-        with:
-          java-version: "8.0.382+5"
-          distribution: zulu
       - uses: actions/setup-java@v3
         if: "matrix.java == 11"
         with:
@@ -123,46 +115,24 @@ jobs:
       matrix:
         include:
           - module: inmemory
-            args: "-Dtest.skip.tp=false -DskipTests=true"
-            java: 8
-          - module: berkeleyje
-            args: "-Dtest.skip.tp=false -DskipTests=true"
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true"
-            java: 8
-          - module: cql
-            args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true"
-            java: 8
-          - module: hbase
-            args: "-Dtest.skip.tp=false -DskipTests=true"
-            java: 8
-          - module: inmemory
-            install-args: "-Pjava-11"
             args: "-Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: berkeleyje
-            install-args: "-Pjava-11"
             args: "-Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: cql
-            install-args: "-Pjava-11"
             args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: cql
-            install-args: "-Pjava-11"
             args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: cql
-            install-args: "-Pjava-11"
             args: "-Pcassandra4-byteordered -Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: cql
-            install-args: "-Pjava-11"
             args: "-Pcassandra4-murmur -Dtest.skip.tp=false -DskipTests=true"
             java: 11
           - module: hbase
-            install-args: "-Pjava-11"
             args: "-Dtest.skip.tp=false -DskipTests=true"
             java: 11
     steps:
diff --git a/BUILDING.md b/BUILDING.md
index d9c601caa22..d072d4cbdb3 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -2,8 +2,8 @@
 
 Required:
 
-* Java 8
-* Maven 3
+* Java 11
+* Maven 4
 
 To build without executing tests:
 
diff --git a/docs/changelog.md b/docs/changelog.md
index b3ac7c401ca..108f60c3211 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -49,6 +49,65 @@ The versions of JanusGraph listed below are outdated and will no longer receive
 
 ## Release Notes
 
+
+### Version 1.1.0 (Release Date: ?)
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.janusgraph</groupId>
+    <artifactId>janusgraph-core</artifactId>
+    <version>1.1.0</version>
+</dependency>
+```
+
+```groovy tab='Gradle'
+compile "org.janusgraph:janusgraph-core:1.1.0"
+```
+
+**Tested Compatibility:**
+
+* Apache Cassandra 3.11.10, 4.0.6
+* Apache HBase 2.5.0
+* Oracle BerkeleyJE 7.5.11
+* ScyllaDB 5.1.4
+* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.10.4
+* Apache Lucene 8.11.1
+* Apache Solr 8.11.1
+* Apache TinkerPop 3.7.0
+* Java 11
+
+!!! note
+    Google Bigtable was removed from this list because there is no automatic testing in place specifically for that
+    backend.
+    Since the adapter for Bigtable is however just using the HBase adapter, it is also covered by the tests for HBase.
+
+    We invite anyone who is interested in the Bigtable storage adapter to help with this by contributing so that the
+    tests for HBase are also automatically executed for Bigtable.
+    More information can be found in this GitHub issue:
+    [janusgraph/janusgraph#415](https://github.com/JanusGraph/janusgraph/issues/415).
+
+**Installed versions in the Pre-Packaged Distribution:**
+
+* Cassandra 4.0.6
+* Elasticsearch 7.14.0
+
+#### Changes
+
+For more information on features and bug fixes in 1.1.0, see the GitHub milestone:
+
+-   <https://github.com/JanusGraph/janusgraph/milestone/21?closed=1>
+
+#### Assets
+
+* [JavaDoc](https://javadoc.io/doc/org.janusgraph/janusgraph-core/1.1.0)
+* [GitHub Release](https://github.com/JanusGraph/janusgraph/releases/tag/v1.1.0)
+* [JanusGraph zip](https://github.com/JanusGraph/janusgraph/releases/download/v1.1.0/janusgraph-1.1.0.zip)
+* [JanusGraph zip with embedded Cassandra and ElasticSearch](https://github.com/JanusGraph/janusgraph/releases/download/v1.1.0/janusgraph-full-1.1.0.zip)
+
+#### Upgrade Instructions
+
+##### Removal of Java 8 Support
+
 ### Version 1.0.0 (Release Date: October 21, 2023)
 
 ```xml tab='Maven'
diff --git a/janusgraph-dist/README.md b/janusgraph-dist/README.md
index 1eadd35cd09..6004887e014 100644
--- a/janusgraph-dist/README.md
+++ b/janusgraph-dist/README.md
@@ -2,7 +2,7 @@
 
 ## Building zip archives
 
-Run `mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true -Pjava-11`.  
+Run `mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true`.  
 This command can be run from either the root of the JanusGraph repository 
 (the parent of the janusgraph-dist directory) or the janusgraph-dist directory.
 Running from the root of the repository is recommended.  Running from 
diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml
index 3609ff099ce..ec7819a40ba 100644
--- a/janusgraph-dist/pom.xml
+++ b/janusgraph-dist/pom.xml
@@ -345,15 +345,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>java-11</id>
-            <properties>
-                <packname.standard>janusgraph-java-11-${project.version}</packname.standard>
-                <packname.full>janusgraph-java-11-full-${project.version}</packname.full>
-                <docker.baseimage>eclipse-temurin:11-jre</docker.baseimage>
-                <docker.tag-suffix>-java-11</docker.tag-suffix>
-            </properties>
-        </profile>
         <profile>
             <id>use-scylla</id>
             <properties>
diff --git a/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh b/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh
index 5f610ad7485..076ab9a8bc2 100755
--- a/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh
+++ b/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh
@@ -108,12 +108,7 @@ COLLECTED_JAVA_OPTIONS_FILE=""
 
 # Read user-defined JVM options from jvm.options file
 if [[ -z "$JAVA_OPTIONS_FILE" ]]; then
-  jver=$($JAVA -version 2>&1 | grep 'version' 2>&1 | awk -F\" '{ split($2,a,"."); print a[1]"."a[2]}')
-  if [[ $jver == "1.8" ]]; then                
-    JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-8.options"
-  else
-    JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-11.options"
-  fi
+  JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm.options"
 fi
 if [[ -f "$JAVA_OPTIONS_FILE" ]]; then
   for opt in "$(grep '^-' $JAVA_OPTIONS_FILE)"
diff --git a/janusgraph-dist/src/assembly/static/conf/jvm-8.options b/janusgraph-dist/src/assembly/static/conf/jvm-8.options
deleted file mode 100644
index cadb6ce6de4..00000000000
--- a/janusgraph-dist/src/assembly/static/conf/jvm-8.options
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020 JanusGraph Authors
-#
-# 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.
-
-#################
-# HEAP SETTINGS #
-#################
-
--Xms4096m
--Xmx4096m
-
-
-########################
-# GENERAL JVM SETTINGS #
-########################
-
-
-# enable thread priorities, primarily so we can give periodic tasks
-# a lower priority to avoid interfering with client workload
--XX:+UseThreadPriorities
-
-# allows lowering thread priority without being root on linux - probably
-# not necessary on Windows but doesn't harm anything.
-# see http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workar
--XX:ThreadPriorityPolicy=42
-
-# Enable heap-dump if there's an OOM
--XX:+HeapDumpOnOutOfMemoryError
-
-# Per-thread stack size.
--Xss256k
-
-# Make sure all memory is faulted and zeroed on startup.
-# This helps prevent soft faults in containers and makes
-# transparent hugepage allocation more effective.
--XX:+AlwaysPreTouch
-
-# Enable thread-local allocation blocks and allow the JVM to automatically
-# resize them at runtime.
--XX:+UseTLAB
--XX:+ResizeTLAB
--XX:+UseNUMA
-
-
-####################
-# GREMLIN SETTINGS #
-####################
-
--Dgremlin.io.kryoShimService=org.janusgraph.hadoop.serialize.JanusGraphKryoShimService
-
-
-#################
-#  GC SETTINGS  #
-#################
-
-### CMS Settings
-
--XX:+UseParNewGC
--XX:+UseConcMarkSweepGC
--XX:+CMSParallelRemarkEnabled
--XX:SurvivorRatio=8
--XX:MaxTenuringThreshold=1
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
--XX:CMSWaitDuration=10000
--XX:+CMSParallelInitialMarkEnabled
--XX:+CMSEdenChunksRecordAlways
--XX:+CMSClassUnloadingEnabled
diff --git a/janusgraph-dist/src/assembly/static/conf/jvm-11.options b/janusgraph-dist/src/assembly/static/conf/jvm.options
similarity index 100%
rename from janusgraph-dist/src/assembly/static/conf/jvm-11.options
rename to janusgraph-dist/src/assembly/static/conf/jvm.options
diff --git a/pom.xml b/pom.xml
index 82a292ddf9e..45f6e67aea2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,8 +93,9 @@
         <test.skip.tp>true</test.skip.tp>
         <top.level.basedir>${basedir}</top.level.basedir>
         <maven.javadoc.version>3.5.0</maven.javadoc.version>
-        <compiler.source>1.8</compiler.source>
-        <compiler.target>1.8</compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
         <test.excluded.groups>MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS</test.excluded.groups>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <cassandra.version>3.11.10</cassandra.version>
@@ -360,8 +361,6 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.11.0</version>
                     <configuration>
-                        <source>${compiler.source}</source>
-                        <target>${compiler.target}</target>
                         <compilerArguments>
                             <Xmaxerrs>500</Xmaxerrs>
                         </compilerArguments>
@@ -1430,14 +1429,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>java-11</id>
-            <properties>
-                <compiler.source>11</compiler.source>
-                <compiler.target>11</compiler.target>
-            </properties>
-        </profile>
-
         <profile>
             <id>janusgraph-release</id>
             <!--