diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f704245e..fdfe4e122 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
     - docker
   stage: build
   script:
-    - git submodule update --init --remote
+    - git submodule update --init
     - make distclean
     - make -j
   artifacts:
@@ -113,7 +113,7 @@ endurance-test:
     - docker
   stage: test
   script:
-    - git submodule update --init --remote
+    - git submodule update --init
     - make distclean
     - make -j
     - ./runtest --config server-threads 3 --loop --stop
@@ -125,7 +125,7 @@ coverage-test:
     - docker
   stage: test
   script:
-    - git submodule update --init --remote
+    - git submodule update --init
     - make distclean
     - make gcov -j
     - make install
diff --git a/.gitmodules b/.gitmodules
index 26782f10f..21accf31b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "deps/rocksdb"]
 	path = deps/rocksdb
-	url = https://gitlab.eqalpha.com/submodules/rocksdb.git
-	branch = keydb_v6
+	url = https://github.com/facebook/rocksdb.git
 [submodule "deps/depot_tools"]
 	path = deps/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
diff --git a/deps/rocksdb b/deps/rocksdb
index 887e6bf34..c3034fce3 160000
--- a/deps/rocksdb
+++ b/deps/rocksdb
@@ -1 +1 @@
-Subproject commit 887e6bf34527403164a9c4eb1d62dfb668291734
+Subproject commit c3034fce329017036c807e01261729bfc11a5d62
diff --git a/tests/unit/flash.tcl b/tests/unit/flash.tcl
index 1988d307a..ea3c8e9fe 100644
--- a/tests/unit/flash.tcl
+++ b/tests/unit/flash.tcl
@@ -12,6 +12,16 @@ start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.
         assert_equal {0} [r dbsize] "Key count is accurate after non-existant delete"
     }
 
+    test { DEL of flushed key works } {
+        r flushall
+        r set testkey foo
+        assert_equal {1} [r dbsize] "Only one key after first insert"
+        r flushall cache
+        assert_equal {foo} [r get testkey] "Value still there after flushing cache"
+        r del testkey
+        assert_equal {0} [r dbsize] "No keys after delete"
+    }
+
    test { SET of existing but flushed key works } {
         r flushall
         r set testkey foo
@@ -99,6 +109,16 @@ start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.
         assert_equal $expectedDigest [r debug digest]
     }
 
+    test { DELETE of flushed set member persists after another flush } {
+        r flushall
+        r sadd set1 val1 val2 val3
+        assert_equal {3} [r scard set1]
+        r flushall cache
+        r srem set1 val1
+        r flushall cache
+        assert_equal {2} [r scard set1]
+    }
+
     r flushall
     # If a weak storage memory model is set, wait for any pending snapshot writes to finish
     after 500