diff --git a/HanyadikHetVan.postman_environment.json b/HanyadikHetVan.postman_environment.json
index e3a7980..7ecd601 100644
--- a/HanyadikHetVan.postman_environment.json
+++ b/HanyadikHetVan.postman_environment.json
@@ -29,7 +29,7 @@
 		},
 		{
 			"key": "username",
-			"value": "123test@tester.com",
+			"value": "1234test@tester.com",
 			"enabled": true
 		},
 		{
@@ -41,9 +41,24 @@
 			"key": "ffid",
 			"value": "",
 			"enabled": true
+		},
+		{
+			"key": "proto",
+			"value": "https",
+			"enabled": true
+		},
+		{
+			"key": "host",
+			"value": "localhost",
+			"enabled": true
+		},
+		{
+			"key": "port",
+			"value": "5001",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",
-	"_postman_exported_at": "2021-05-19T23:36:24.220Z",
-	"_postman_exported_using": "Postman/8.4.0"
+	"_postman_exported_at": "2021-06-09T13:11:24.551Z",
+	"_postman_exported_using": "Postman/8.6.1"
 }
\ No newline at end of file
diff --git a/PartOne.postman_collection.json b/PartOne.postman_collection.json
index 666406d..696de8b 100644
--- a/PartOne.postman_collection.json
+++ b/PartOne.postman_collection.json
@@ -14,12 +14,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v1/HanyadikHetVan",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v1/HanyadikHetVan",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v1",
@@ -29,6 +29,25 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Healthcheck",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{proto}}://{{host}}:{{port}}/healthz",
+					"protocol": "{{proto}}",
+					"host": [
+						"{{host}}"
+					],
+					"port": "{{port}}",
+					"path": [
+						"healthz"
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "AdminLogin",
 			"event": [
@@ -82,12 +101,12 @@
 					]
 				},
 				"url": {
-					"raw": "https://localhost:5001/connect/token",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/connect/token",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"connect",
 						"token"
@@ -121,12 +140,12 @@
 					}
 				},
 				"url": {
-					"raw": "https://localhost:5001/api/v2/User",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/User",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -189,12 +208,12 @@
 					]
 				},
 				"url": {
-					"raw": "https://localhost:5001/connect/token",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/connect/token",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"connect",
 						"token"
@@ -240,12 +259,12 @@
 					}
 				},
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -271,12 +290,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/HanyadikHetVan/my",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/HanyadikHetVan/my",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -303,12 +322,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan/{{wtsid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan/{{wtsid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
diff --git a/PartThree.postman_collection.json b/PartThree.postman_collection.json
index 303e859..7087972 100644
--- a/PartThree.postman_collection.json
+++ b/PartThree.postman_collection.json
@@ -61,12 +61,12 @@
 					]
 				},
 				"url": {
-					"raw": "https://localhost:5001/connect/token",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/connect/token",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"connect",
 						"token"
@@ -112,12 +112,12 @@
 					}
 				},
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -145,12 +145,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/FunFact/WeeklyTimeSpan/{{wtsid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/FunFact/WeeklyTimeSpan/{{wtsid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -218,12 +218,12 @@
 					]
 				},
 				"url": {
-					"raw": "https://localhost:5001/connect/token",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/connect/token",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"connect",
 						"token"
@@ -250,12 +250,12 @@
 				"method": "DELETE",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/FunFact/{{ffid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/FunFact/{{ffid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -284,12 +284,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/FunFact/WeeklyTimeSpan/{{wtsid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/FunFact/WeeklyTimeSpan/{{wtsid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
diff --git a/PartTwo.postman_collection.json b/PartTwo.postman_collection.json
index a59d13e..17c612b 100644
--- a/PartTwo.postman_collection.json
+++ b/PartTwo.postman_collection.json
@@ -32,12 +32,12 @@
 					}
 				},
 				"url": {
-					"raw": "https://localhost:5001/api/v2/Pause",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/Pause",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -53,12 +53,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/HanyadikHetVan/my",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/HanyadikHetVan/my",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -75,12 +75,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/Pause/{{pauseid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/Pause/{{pauseid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -97,12 +97,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan/{{wtsid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan/{{wtsid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -169,12 +169,12 @@
 					]
 				},
 				"url": {
-					"raw": "https://localhost:5001/connect/token",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/connect/token",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"connect",
 						"token"
@@ -201,12 +201,12 @@
 				"method": "DELETE",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/Pause/{{pauseid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/Pause/{{pauseid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -223,12 +223,12 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan/{{wtsid}}",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan/{{wtsid}}",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",
@@ -254,12 +254,12 @@
 					}
 				},
 				"url": {
-					"raw": "https://localhost:5001/api/v2/WeeklyTimeSpan",
-					"protocol": "https",
+					"raw": "{{proto}}://{{host}}:{{port}}/api/v2/WeeklyTimeSpan",
+					"protocol": "{{proto}}",
 					"host": [
-						"localhost"
+						"{{host}}"
 					],
-					"port": "5001",
+					"port": "{{port}}",
 					"path": [
 						"api",
 						"v2",