diff --git a/config/http/notifications/base/storage.json b/config/http/notifications/base/storage.json
index 1360ce6a7..90e2914ca 100644
--- a/config/http/notifications/base/storage.json
+++ b/config/http/notifications/base/storage.json
@@ -7,12 +7,9 @@
       "@type": "KeyValueChannelStorage",
       "locker": { "@id": "urn:solid-server:default:ResourceLocker" },
       "storage": {
-        "@type": "Base64EncodingStorage",
-        "source": {
-          "@type": "ContainerPathStorage",
-          "relativePath": "/notifications/",
-          "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-        }
+        "@type": "ContainerPathStorage",
+        "relativePath": "/notifications/",
+        "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
       }
     }
   ]
diff --git a/config/identity/handler/jwks/default.json b/config/identity/handler/jwks/default.json
index fe7e54f85..aaea0912a 100644
--- a/config/identity/handler/jwks/default.json
+++ b/config/identity/handler/jwks/default.json
@@ -11,12 +11,9 @@
     },
     {
       "@id": "urn:solid-server:default:KeyStorage",
-      "@type": "Base64EncodingStorage",
-      "source": {
-        "@type": "ContainerPathStorage",
-        "relativePath": "/idp/keys/",
-        "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-      }
+      "@type": "ContainerPathStorage",
+      "relativePath": "/idp/keys/",
+      "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
     }
   ]
 }
diff --git a/config/identity/handler/storage/default.json b/config/identity/handler/storage/default.json
index 5cab26db9..0dc79fae9 100644
--- a/config/identity/handler/storage/default.json
+++ b/config/identity/handler/storage/default.json
@@ -39,12 +39,9 @@
         "@id": "urn:solid-server:default:CookieStorage",
         "@type": "WrappedExpiringStorage",
         "source": {
-          "@type": "Base64EncodingStorage",
-          "source": {
-            "@type": "ContainerPathStorage",
-            "relativePath": "/accounts/cookies/",
-            "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-          }
+          "@type": "ContainerPathStorage",
+          "relativePath": "/accounts/cookies/",
+          "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
         }
       }
     },
diff --git a/config/identity/handler/storage/password.json b/config/identity/handler/storage/password.json
index 42574f5b9..9352a6be5 100644
--- a/config/identity/handler/storage/password.json
+++ b/config/identity/handler/storage/password.json
@@ -30,12 +30,9 @@
         "@id": "urn:solid-server:default:ForgotPasswordStorage",
         "@type": "WrappedExpiringStorage",
         "source": {
-          "@type": "Base64EncodingStorage",
-          "source": {
-            "@type": "ContainerPathStorage",
-            "relativePath": "/accounts/forgot-password/",
-            "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-          }
+          "@type": "ContainerPathStorage",
+          "relativePath": "/accounts/forgot-password/",
+          "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
         }
       }
     }
diff --git a/config/identity/ownership/token.json b/config/identity/ownership/token.json
index b22eea23c..e91f63ccb 100644
--- a/config/identity/ownership/token.json
+++ b/config/identity/ownership/token.json
@@ -13,12 +13,9 @@
       "@id": "urn:solid-server:default:ExpiringTokenStorage",
       "@type": "WrappedExpiringStorage",
       "source": {
-        "@type": "Base64EncodingStorage",
-        "source": {
-          "@type": "ContainerPathStorage",
-          "relativePath": "/idp/tokens/",
-          "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-        }
+        "@type": "ContainerPathStorage",
+        "relativePath": "/idp/tokens/",
+        "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
       }
     }
   ]
diff --git a/config/storage/key-value/storages/storages.json b/config/storage/key-value/storages/storages.json
index 247179976..453e703ab 100644
--- a/config/storage/key-value/storages/storages.json
+++ b/config/storage/key-value/storages/storages.json
@@ -2,7 +2,7 @@
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "@graph": [
     {
-      "comment": "Used for internal storage by the locker.",
+      "comment": "Used for internal storage by the locker. Always hashing the keys to prevent issues.",
       "@id": "urn:solid-server:default:LockStorage",
       "@type": "HashEncodingStorage",
       "source": {
@@ -14,12 +14,9 @@
     {
       "comment": "Storage used by setup components.",
       "@id": "urn:solid-server:default:SetupStorage",
-      "@type": "Base64EncodingStorage",
-      "source": {
-        "@type": "ContainerPathStorage",
-        "relativePath": "/setup/",
-        "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
-      }
+      "@type": "ContainerPathStorage",
+      "relativePath": "/setup/",
+      "source": { "@id": "urn:solid-server:default:KeyValueStorage" }
     }
   ]
 }