diff --git a/puppet/modules/opendispense2/manifests/init.pp b/puppet/modules/opendispense2/manifests/init.pp
index baac24d6b8e716d809d215cf494973fc701cf1fb..f5fc78b14fd46977268f58b8350466215938d10d 100644
--- a/puppet/modules/opendispense2/manifests/init.pp
+++ b/puppet/modules/opendispense2/manifests/init.pp
@@ -41,4 +41,20 @@ class opendispense2 {
 	  source => "https://github.com/ucc/OpenDispense2.git",
 	  revision => 'master',
 	}
+
+
+	file { '/etc/opendispense2':
+	  ensure => 'directory',
+	}
+
+
+        file { '/etc/opendispense2/dispsrv.conf':
+          ensure => file,
+          content => template('opendispense2/dispsrv.conf.erb'),
+        }
+
+        file { '/etc/opendispense2/items.cfg':
+          ensure => file,
+          content => template('opendispense2/items.cfg.erb'),
+        }
 }
diff --git a/puppet/modules/opendispense2/templates/dispsrv.conf.erb b/puppet/modules/opendispense2/templates/dispsrv.conf.erb
new file mode 100644
index 0000000000000000000000000000000000000000..d4eff4e1f93cc9f60bc96f01b43806f9a28bc5c3
--- /dev/null
+++ b/puppet/modules/opendispense2/templates/dispsrv.conf.erb
@@ -0,0 +1,33 @@
+#
+# OpenDispense2 Server config file
+#
+daemonise yes
+server_port 11020
+cokebank_database /var/local/opendispense2/cokebank.db
+items_file /usr/local/etc/opendispense2/items.cfg
+
+# PLC - coke brain
+# localhost - virtualcoke
+coke_modbus_address 127.0.0.1
+coke_modbus_port 1502
+#coke_modbus_address 0.0.0.0
+
+# Zero price items, defaults to off
+test_mode no
+#test_mode yes
+
+# NEVER DISABLE IN PRODUCTION!
+# - Only used for testing configs (i.e. with another database)
+disable_syslog no
+
+# Used to set dispense into a dummy mode when the coke machine is out of action
+# and we're dispensing drinks from the fridge (or manually)
+coke_dummy_mode no
+#coke_dummy_mode yes
+
+# It's Christmas Time
+door_serial_port /dev/ttyUSB0
+#door_serial_port /dev/null
+door_unlocked_delay 10
+
+#trusted_host 130.95.13.4	# Merlo
diff --git a/puppet/modules/opendispense2/templates/items.cfg.erb b/puppet/modules/opendispense2/templates/items.cfg.erb
new file mode 100644
index 0000000000000000000000000000000000000000..5b69bab1b4d40a43c6f5d9c239537e51d21552c6
--- /dev/null
+++ b/puppet/modules/opendispense2/templates/items.cfg.erb
@@ -0,0 +1,133 @@
+# This is an edit by [SZM] not as root! Items prefixed with a '-' will
+# not show up in the GUI (Actually aren't returned by ENUM_ITEMS) Items
+# with the name "dead" do not dispense (returning error instead)
+
+# TIPS FOR PRICING:
+# - Drinks: Add 50% and round to something strange
+# - Snacks: Add 30% and do the same
+
+# Type	ID	Price	Description
+
+# Drinks
+coke	0	84	null coke	
+coke	1	80	solo	
+coke	2	84	lemonade	
+coke	3	84	pasito	
+coke	4	84	screaming soda	
+coke	5	88	vanilla pepsi max	
+coke	6	96	coke	
+
+
+# Pseudo items
+pseudo	0	10	laserprint 5 pages	# print 5 pages
+#pseudo	1	30	manual phone	# Ring Ring!
+pseudo	2	128	clue	# clue.flac - Don't Ask, Currently Broken (TM)
+#pseudo	3	1500	Quiz Night Ticket (LOCKBOX Ask door)
+pseudo	3	11000	UCC Camp 2018 (Student)	
+pseudo	4	12000	UCC Camp 2018 (Non-Student)	
+pseudo	5	1800	UCC T-Shirt	# Polo Shirt! (With UCC Sun Logo)
+#pseudo	7	2500	membership (non-student and non-guild)	# here comes the money!
+#pseudo	8	2000	membership (non-student and guild)	
+#pseudo	9	1500	membership (student and non-guild)	
+#pseudo	10	1000	membership (student and guild)	
+pseudo	7	1200	membership (non-student and non-guild)	# here comes the money!
+pseudo	8	1000	membership (non-student and guild)	
+pseudo	9	700	membership (student and non-guild)	
+pseudo	10	500	membership (student and guild)	
+#pseudo	11	500	membership (oday special)	# only on O-Day
+-door	0	0	door	# Open Sesame
+
+# - Alternative coke machine entries (for LANs)
+#pseudo	34	93	ReLAN - Coke
+#pseudo	35	80	ReLAN - Schweppes
+#pseudo	36	80	ReLAN - Solo
+#pseudo	52	140	ReLAN - Smiths Original
+#pseudo	53	140	ReLAN - Honey Soy Chips
+#pseudo	54	140	ReLAN - Red Rock Sea Salt
+#pseudo	55	200	ReLAN - Crunchie Twin Pack
+#pseudo	56	250	ReLAN - Starbursts
+
+# - Items available on Camp (2018)
+#pseudo	57	50	CAMP - Crunchie
+#pseudo	58	390	CAMP - Cadbury Slab
+#pseudo	59	40	CAMP - Freddo
+#pseudo	60	390	CAMP - McVitie's Choc Digestives
+#pseudo	61	390	CAMP - Choc Chip Cookies
+#pseudo	62	208	CAMP - Milk Arrowroot
+#pseudo	63	390	CAMP - Skittles
+#pseudo	64	470	CAMP - M&Ms
+#pseudo	65	54	CAMP - Muesli Bar
+#pseudo	65	51	CAMP - Smith's Crisps
+#pseudo	66	100	CAMP - Can of Soft Drink
+#pseudo	67	180	CAMP - Bundaberg Ginger Beer
+
+# - Items available on request from Server Room
+#pseudo	79	299	SRVR ROOM - Delta Creme Biscuits
+#pseudo	80	60	SRVR ROOM - Mi Goreng (packet)
+#pseudo	81	55	SRVR ROOM - Maggi Noodles (packet)
+#pseudo	82	242	SRVR ROOM - Pizza Night Flavour Popcorn
+#pseudo	83	196	SRVR ROOM - Oreos
+#pseudo	84	50	MACHRM - Crunchie
+#pseudo	85	390	MACHRM - Cadbury Slab
+#pseudo	86	40	MACHRM - Freddo
+pseudo	87	390	MACHRM - Choc Chip Cookies
+pseudo	88	180	MACHRM - Bundaberg Ginger Beer
+
+# Snack machine
+# - Row 1: Generally Chips
+-snack	11	51	Twisties Cheese	
+-snack	31	51	Smiths Original	
+-snack	51	51	Smiths Salt and Vinegar	
+-snack	71	51	Cheese Balls	
+-snack	91	51	Burger Rings	
+
+# - Row 2: Sweet things
+-snack	12	390	Cadbury Slab #465	M&Ms 180g	 #249	Starburst Chews
+-snack	32	390 	Cadbury Slab # 465	M&Ms Peanut 180g	#249	Starburst Babies	
+-snack	52	390 	Cadbury Slab #48	Tiny Teddy Choc Chip	
+-snack	72	49	Tiny Teddy Honey	
+-snack	92	47	Tiny Teddy Chocolate	
+
+# - Row 3: Mixed
+-snack	13	387	Skittles Fruit	
+#73	Up&Go Banana	#77	Fruit Salad
+-snack	33	0	dead	# Actually dead do not use
+-snack	53	387	Skittles Sour	#76	Up&Go Vanilla	#133	Up&Go Vanilla
+-snack	73	387	Skittles Desserts	#74	Up&Go Strawberry	
+-snack	93	0	dead	#103	Tuna Sriracha	
+
+# - Row 4: Thinner items
+-snack	4	0	dead	#17	M&Ms
+-snack	14	65	Mango Muesli Bar	#34	Skittles
+-snack	24	65	Honey Yog. Muesli Bar	
+-snack	34	65	Forest Fruits Muesli Bar	
+-snack	44	65	Strawberry Muesli Bar	
+-snack	54	65	Choc Chip Muesli Bar	
+-snack	64	65	Aussie Faves Muesli Bar	#72	LeSnak Tasty Cheese	# 182	Chewing gum
+-snack	74	65	White Choc Muesli Bar	#	23	Milky Way	# 129	SourRainbow
+-snack	84	65	Apricot Muesli Bar
+-snack	94	0	empty	
+
+# - Row 5: "There is no row 5" *waves hand*
+
+# - Row 6: Thin items
+-snack	6	40	Milk top Freddo 	#37	Berry Rollup
+-snack	16	0	dead	#37	FruitSaladRollup
+-snack	26	72	Lesnak Cheddar	#42	cookiesCaramel
+-snack	36	72	Lesnak Cheddar	#42	cookiesChoc
+-snack	46	72	Lesnak Cheddar	#42	cookiesRainbow
+-snack	56	51	Crunchie
+-snack	66	0	dead	
+-snack	76	0	dead	#302	Cappuccino Topping
+-snack	86	16	M&Ms Tiny	#65	LeSnak Cheddar	
+-snack	96	54	Instant Cappuccino	
+
+# - Row 7: Misc
+-snack	17	52	Chicken Shapes	
+-snack	37	0	dead	#56	Pizza Shapes	#47      Choc-chip Cookies
+-snack	57	0	dead	#58	BBQ Shapes	
+-snack	77	51	Twisties Chicken	#0	dead	#55	Smiths Chicken
+-snack	97	0	dead	#55	Smiths BBQ	
+
+#-snack	42	0	dead	# it's a mystery!
+
diff --git a/puppet/modules/uccvend-vendserver/manifests/init.pp b/puppet/modules/uccvend-vendserver/manifests/init.pp
index 657d1010166b952a25e3f83b9a3ed2a82593b64f..a7cced418fc4cb125467cd9f2794f5f26eb4f23f 100644
--- a/puppet/modules/uccvend-vendserver/manifests/init.pp
+++ b/puppet/modules/uccvend-vendserver/manifests/init.pp
@@ -12,4 +12,13 @@ class uccvend-vendserver {
 	  source => "git://git.ucc.asn.au/uccvend-vendserver.git",
 	  revision => 'master',
 	}
+
+	file { '/etc/dispense2':
+	  ensure => 'directory',
+	}
+
+	file { '/etc/dispense2/servers.conf':
+	  ensure => file,
+	  content => template('uccvend-vendserver/servers.conf.erb'),
+	}
 }
diff --git a/puppet/modules/uccvend-vendserver/templates/servers.conf.erb b/puppet/modules/uccvend-vendserver/templates/servers.conf.erb
new file mode 100644
index 0000000000000000000000000000000000000000..9db41ddc784b7800724a21585ceca0e34553f375
--- /dev/null
+++ b/puppet/modules/uccvend-vendserver/templates/servers.conf.erb
@@ -0,0 +1,27 @@
+[Database]
+Server = localhost
+Name = dispense
+
+[DoorLock]
+ServiceName = DOOR
+Password = portal
+DBUser = doorserver
+DBPassword = secret
+
+[VendingMachine]
+ServiceName = VEND
+Password = feedme
+CryptKey = AAAAAAAAAAAAAAAA
+DBUser = vendserver
+DBPassword = secret
+
+[CokeMachine]
+ServiceName = COKE
+Password = drinkme
+DBUser = cokeserver
+DBPassword = secret
+
+[DecServer]
+name = outside
+ConnectPassword = digital
+PrivPassword = maynard