diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..e2a924e8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,29 @@
+## _System Configuration_
+
+### PhoneGap Desktop version / PhoneGap CLI version
+
+### PhoneGap Mobile App version
+
+### Mobile devices & Mobile OS version
+
+### Computer OS version
+
+### Network Type (home/corporate)
+
+### Is your network using a proxy?
+
+### Computer / Network security (firewall / anti-virus / disk encryption)
+
+### Are you using VMs on your computer?
+
+### Do you have multiple network adapters (or virtual network adapters)?
+
+### Are you using VPN?
+
+### Expected Behaviour
+
+### Actual Behaviour
+
+### Steps to Reproduce 
+
+#### Error messages
diff --git a/update-server/test/PhoneGap-test-0.2.2-mac.zip b/update-server/test/PhoneGap-test-0.2.2-mac.zip
new file mode 100644
index 00000000..7c0e1b8d
Binary files /dev/null and b/update-server/test/PhoneGap-test-0.2.2-mac.zip differ
diff --git a/update-server/test/PhoneGap-test-0.2.2-mac.zip.REMOVED.git-id b/update-server/test/PhoneGap-test-0.2.2-mac.zip.REMOVED.git-id
deleted file mode 100644
index b427e2ff..00000000
--- a/update-server/test/PhoneGap-test-0.2.2-mac.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7c0e1b8dfa1f05a250c2c9dc7330ae80a66f8e63
\ No newline at end of file
diff --git a/update-server/test/PhoneGap-test-0.2.2-win.zip b/update-server/test/PhoneGap-test-0.2.2-win.zip
new file mode 100644
index 00000000..8325687e
Binary files /dev/null and b/update-server/test/PhoneGap-test-0.2.2-win.zip differ
diff --git a/update-server/test/PhoneGap-test-0.2.2-win.zip.REMOVED.git-id b/update-server/test/PhoneGap-test-0.2.2-win.zip.REMOVED.git-id
deleted file mode 100644
index 1bef9407..00000000
--- a/update-server/test/PhoneGap-test-0.2.2-win.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8325687e1fb83cff3be577f98f089d68efdade3d
\ No newline at end of file