diff --git a/Dockerfile b/Dockerfile
index f3b76ab35b..ceb707c374 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,8 @@ RUN groupadd --gid ${GID} ${USER} \
 
 USER ${USER}
 
-RUN npm install --omit=dev
+RUN npm install --omit=dev \
+    && rm -rf .npm
     # TODO: generate lockfiles for each package manager
     ## pnpm import \
 
diff --git a/dev.Dockerfile b/dev.Dockerfile
index bab7d800c5..4946d18725 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -38,8 +38,9 @@ COPY --from=git --chown=${USER}:${USER} /usr/src/app/install/package.json /usr/s
 
 USER ${USER}
 
-RUN npm install
-  
+RUN npm install \
+    && rm -rf .npm
+
 FROM node:lts-slim AS final
 
 ENV NODE_ENV=development \
diff --git a/test/controllers.js b/test/controllers.js
index 750111db30..c664980aee 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -942,7 +942,7 @@ describe('Controllers', () => {
 		it('should redirect to account page with logged in user', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/login`, { jar });
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/user/foo');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/foo'));
 			assert.equal(body, '/user/foo');
 		});
 
@@ -954,14 +954,14 @@ describe('Controllers', () => {
 		it('should redirect to userslug', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/uid/${fooUid}`);
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/user/foo');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/foo'));
 			assert.equal(body, '/user/foo');
 		});
 
 		it('should redirect to userslug and keep query params', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/uid/${fooUid}/topics?foo=bar`);
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/user/foo/topics?foo=bar');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/foo/topics?foo=bar'));
 			assert.equal(body, '/user/foo/topics?foo=bar');
 		});
 
@@ -981,14 +981,14 @@ describe('Controllers', () => {
 			it('api should redirect to /user/[userslug]/bookmarks', async () => {
 				const { response, body } = await request.get(`${nconf.get('url')}/api/me/bookmarks`, { jar });
 				assert.equal(response.statusCode, 200);
-				assert.equal(response.headers['x-redirect'], '/user/foo/bookmarks');
+				assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/foo/bookmarks'));
 				assert.equal(body, '/user/foo/bookmarks');
 			});
 
 			it('api should redirect to /user/[userslug]/edit/username', async () => {
 				const { response, body } = await request.get(`${nconf.get('url')}/api/me/edit/username`, { jar });
 				assert.equal(response.statusCode, 200);
-				assert.equal(response.headers['x-redirect'], '/user/foo/edit/username');
+				assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/foo/edit/username'));
 				assert.equal(body, '/user/foo/edit/username');
 			});
 
@@ -1387,7 +1387,7 @@ describe('Controllers', () => {
 		it('should return correct post path', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/post/${pid}`);
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/topic/1/test-topic-title');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/topic/1/test-topic-title'));
 			assert.equal(body, '/topic/1/test-topic-title');
 		});
 	});
@@ -1500,7 +1500,7 @@ describe('Controllers', () => {
 			});
 			const { response, body } = await request.get(`${nconf.get('url')}/api/users`);
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/api/popular');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/api/popular'));
 			assert(body, '/api/popular');
 		});
 
@@ -1605,12 +1605,12 @@ describe('Controllers', () => {
 			const { cid } = category;
 
 			let result = await request.get(`${nconf.get('url')}/api/category/${category.slug}`, { jar });
-			assert.equal(result.response.headers['x-redirect'], 'https://nodebb.org');
+			assert.equal(result.response.headers['x-redirect'], encodeURIComponent('https://nodebb.org'));
 			assert.equal(result.body, 'https://nodebb.org');
 			await categories.setCategoryField(cid, 'link', '/recent');
 
 			result = await request.get(`${nconf.get('url')}/api/category/${category.slug}`, { jar });
-			assert.equal(result.response.headers['x-redirect'], '/recent');
+			assert.equal(result.response.headers['x-redirect'], encodeURIComponent('/recent'));
 			assert.equal(result.body, '/recent');
 		});
 
@@ -1686,7 +1686,7 @@ describe('Controllers', () => {
 		it('should redirect if page is out of bounds', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/unread?page=-1`, { jar });
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/unread?page=1');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/unread?page=1'));
 			assert.equal(body, '/unread?page=1');
 		});
 	});
diff --git a/test/messaging.js b/test/messaging.js
index 86008e2021..0dc7012fd3 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -807,7 +807,7 @@ describe('Messaging Library', () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/chats`, { jar });
 
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], '/user/herp/chats');
+			assert.equal(response.headers['x-redirect'], encodeURIComponent('/user/herp/chats'));
 			assert.equal(body, '/user/herp/chats');
 		});
 
diff --git a/test/topics.js b/test/topics.js
index 8a32e445f5..366a7f85bc 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -1104,7 +1104,7 @@ describe('Topic\'s', () => {
 		it('should redirect if post index is out of range', async () => {
 			const { response, body } = await request.get(`${nconf.get('url')}/api/topic/${topicData.slug}/-1`);
 			assert.equal(response.statusCode, 200);
-			assert.equal(response.headers['x-redirect'], `/topic/${topicData.tid}/topic-for-controller-test`);
+			assert.equal(response.headers['x-redirect'], encodeURIComponent(`/topic/${topicData.tid}/topic-for-controller-test`));
 			assert.equal(body, `/topic/${topicData.tid}/topic-for-controller-test`);
 		});