diff --git a/7days2die/7days2die-docker.json b/7days2die/7days2die-docker.json
deleted file mode 100644
index 9f93f069..00000000
--- a/7days2die/7days2die-docker.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "type": "srcds",
-  "display": "7 Days to Die (Docker)",
-  "install": [
-    {
-      "type": "command",
-      "commands": [
-        "steamcmd +force_install_dir /pufferpanel +login anonymous +app_update 294420 +quit"
-      ]      
-    }
-  ],
-  "run": {
-    "command": "./7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml",
-    "stopCode": 2,
-    "environmentVars": {
-      "LD_LIBRARY_PATH": "./linux64:$LD_LIBRARY_PATH"
-    }
-  },
-  "environment": {
-    "image": "steamcmd/steamcmd",
-    "type": "docker"
-  },
-  "supportedEnvironments": [
-    {
-      "image": "steamcmd/steamcmd",
-      "type": "docker"
-    }
-  ],
-  "requirements": {
-    "arch": "amd64"
-  }
-}
\ No newline at end of file
diff --git a/7days2die/7days2die.json b/7days2die/7days2die.json
index abb5ac49..cba395ec 100644
--- a/7days2die/7days2die.json
+++ b/7days2die/7days2die.json
@@ -6,30 +6,55 @@
   },
   "install": [
     {
-      "appId": "294420",
-      "type": "steamgamedl"
+      "type": "steamgamedl",
+      "appId": "294420",      
+      "if": "env == \"host\""
+    },
+    {
+      "type": "command",
+      "commands": [
+        "steamcmd +force_install_dir /pufferpanel +login anonymous +app_update 294420 +quit"
+      ],
+      "if": "env == \"docker\""
     },
     {
       "type": "command",
       "commands": [
         "chmod +x 7DaysToDieServer.x86_64"
-      ]
+      ],
+      "if": "os != \"windows\""
     }
   ],
   "run": {
-    "command": "./7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml",
-    "stopCode": 2,
+    "command": [
+      {
+        "command": "./7DaysToDieServer.exe -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml",
+        "if": "os == \"windows\""
+      },
+      {
+        "command": "./7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml",
+        "if": "os != \"windows\""
+      }
+    ],
+    "stop": "shutdown",
     "environmentVars": {
       "LD_LIBRARY_PATH": "./linux64:$LD_LIBRARY_PATH"
+    },
+    "stdin": {
+      "type": "telnet",
+      "port": "8081"
     }
   },
   "supportedEnvironments": [
     {
       "type": "host"
+    },
+    {
+      "type": "docker",
+      "image": "steamcmd/steamcmd"      
     }
   ],
   "requirements": {
-    "os": "linux",
     "arch": "amd64"
   }
 }
\ No newline at end of file
diff --git a/7days2die/data.json b/7days2die/data.json
new file mode 100644
index 00000000..f2eb0e55
--- /dev/null
+++ b/7days2die/data.json
@@ -0,0 +1,15 @@
+[
+    {
+        "name": "7days2die",
+        "environment": {
+            "type": "host"
+        }
+    },
+    {
+        "name": "7days2die-docker",
+        "environment": {
+            "type": "docker",
+            "image": "steamcmd/steamcmd"
+        }
+    }
+]
\ No newline at end of file