diff --git a/devices/geeni-gn-sw003-199s-6-outlet-power-strip.json b/devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.json
similarity index 95%
rename from devices/geeni-gn-sw003-199s-6-outlet-power-strip.json
rename to devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.json
index 3bba8c52..351fc05f 100644
--- a/devices/geeni-gn-sw003-199s-6-outlet-power-strip.json
+++ b/devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.json
@@ -1,13 +1,13 @@
 {
 	"manufacturer": "Geeni",
-	"name": "GN SW003 199S 6-Outlet Power Strip",
+	"name": "GN SW003 199S 6-Outlet Power Strip WB3S BK7231T v1.0.7",
 	"key": "keya4gvchmtapm8n",
 	"ap_ssid": "Geeni",
 	"github_issues": [
 		334
 	],
 	"image_urls": [
-		"geeni-gn-sw003-199s-6-outlet-power-strip.jpg"
+		"geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.jpg"
 	],
 	"profiles": [
 		"oem-bk7231s-rnd-switch-1.0.7-sdk-2.0.0-30.06"
diff --git a/devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.json b/devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.json
new file mode 100644
index 00000000..bf5af82c
--- /dev/null
+++ b/devices/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.json
@@ -0,0 +1,215 @@
+{
+	"manufacturer": "Geeni",
+	"name": "GN SW003 199S 6-Outlet Power Strip WB3S BK7231T v1.1.8",
+	"key": "keya4gvchmtapm8n",
+	"ap_ssid": "Geeni",
+	"github_issues": [
+		334
+	],
+	"image_urls": [
+		"geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.jpg"
+	],
+	"profiles": [
+		"oem-bk7231s-rnd-switch-1.1.8-sdk-1.0.2-40.00"
+	],
+	"schemas": {
+		"000002bgm8": [
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 1
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 2
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 3
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 4
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 5,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 6,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 9,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 10,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 11,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 12,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 13,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 14,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"off",
+						"on",
+						"memory"
+					],
+					"type": "enum"
+				},
+				"id": 38,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 42,
+				"type": "obj"
+			}
+		]
+	},
+	"device_configuration": {
+		"bt_type": 0,
+		"ch_cddpid1": 9,
+		"ch_cddpid2": 10,
+		"ch_cddpid3": 11,
+		"ch_cddpid4": 12,
+		"ch_cddpid5": 13,
+		"ch_cddpid6": 14,
+		"ch_dpid1": 1,
+		"ch_dpid2": 2,
+		"ch_dpid3": 3,
+		"ch_dpid4": 4,
+		"ch_dpid5": 5,
+		"ch_dpid6": 6,
+		"ch_flag1": 1,
+		"ch_flag2": 1,
+		"ch_flag3": 1,
+		"ch_flag4": 1,
+		"ch_flag5": 1,
+		"ch_flag6": 1,
+		"ch_num": 6,
+		"crc": 0,
+		"cyc_dpid": 42,
+		"inch_dp": 44,
+		"init_conf": 38,
+		"jv": "1.0.3",
+		"led_dp": 40,
+		"lock_dp": 41,
+		"module": "WB3S",
+		"mxcl_led_m": 0,
+		"net_trig": 1,
+		"netled_lv": 0,
+		"netled_pin": 1,
+		"netn_led": 0,
+		"nety_led": 1,
+		"rand_dpid": 43,
+		"reset_t": 3,
+		"reuse_led_m": 0,
+		"rl1_lv": 1,
+		"rl1_pin": 6,
+		"rl2_lv": 1,
+		"rl2_pin": 24,
+		"rl3_lv": 1,
+		"rl3_pin": 26,
+		"rl4_lv": 1,
+		"rl4_pin": 9,
+		"rl5_lv": 1,
+		"rl5_pin": 8,
+		"rl6_lv": 1,
+		"rl6_pin": 7,
+		"total_bt_lv": 0,
+		"total_bt_pin": 10,
+		"total_stat": 2
+	}
+}
diff --git a/images/geeni-gn-sw003-199s-6-outlet-power-strip.jpg b/images/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.jpg
similarity index 100%
rename from images/geeni-gn-sw003-199s-6-outlet-power-strip.jpg
rename to images/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.0.7.jpg
diff --git a/images/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.jpg b/images/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.jpg
new file mode 100644
index 00000000..c16242b2
Binary files /dev/null and b/images/geeni-gn-sw003-199s-6-outlet-power-strip-wb3s-bk7231t-v1.1.8.jpg differ