diff --git a/database/seeds/TerrariaServiceTableSeeder.php b/database/seeds/TerrariaServiceTableSeeder.php
new file mode 100644
index 000000000..129ce6a12
--- /dev/null
+++ b/database/seeds/TerrariaServiceTableSeeder.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+use Illuminate\Database\Seeder;
+
+use Pterodactyl\Models;
+
+class TerrariaServiceTableSeeder extends Seeder
+{
+    /**
+     * The core service ID.
+     *
+     * @var Models\Service
+     */
+    protected $service;
+
+    /**
+     * Stores all of the option objects
+     *
+     * @var array
+     */
+    protected $option = [];
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->addCoreService();
+        $this->addCoreOptions();
+        $this->addVariables();
+    }
+
+    private function addCoreService()
+    {
+        $this->service = Models\Service::create([
+            'author' => 'ptrdctyl-v040-11e6-8b77-86f30ca893d3',
+            'name' => 'Terraria',
+            'description' => 'Terraria is a land of adventure! A land of mystery! A land that\'s yours to shape, defend, and enjoy. Your options in Terraria are limitless. Are you an action gamer with an itchy trigger finger? A master builder? A collector? An explorer? There\'s something for everyone.',
+            'file' => 'terraria',
+            'executable' => 'TerrariaServer.exe',
+            'startup' => '-port {{SERVER_PORT}} -autocreate 2 -worldname World'
+        ]);
+    }
+
+    private function addCoreOptions()
+    {
+        $this->option['tshock'] = Models\ServiceOptions::create([
+            'parent_service' => $this->service->id,
+            'name' => 'Terraria Server (TShock)',
+            'description' => 'TShock is a server modification for Terraria, written in C#, and based upon the Terraria Server API. It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.',
+            'tag' => 'tshock',
+            'docker_image' => 'quay.io/pterodactyl/terraria:tshock',
+            'executable' => '',
+            'startup' => ''
+        ]);
+    }
+
+    private function addVariables()
+    {
+        Models\ServiceVariables::create([
+            'option_id' => $this->option['tshock']->id,
+            'name' => 'TShock Version',
+            'description' => 'Which version of TShock to install and use.',
+            'env_variable' => 'T_VERSION',
+            'default_value' => '4.3.17',
+            'user_viewable' => 1,
+            'user_editable' => 1,
+            'required' => 1,
+            'regex' => '/^([0-9_\.-]{5,10})$/'
+        ]);
+
+        Models\ServiceVariables::create([
+            'option_id' => $this->option['vanilla']->id,
+            'name' => 'Maximum Slots',
+            'description' => 'Total number of slots to allow on the server.',
+            'env_variable' => 'MAX_SLOTS',
+            'default_value' => '20',
+            'user_viewable' => 1,
+            'user_editable' => 0,
+            'required' => 1,
+            'regex' => '/^(\d){1,3}$/'
+        ]);
+    }
+}
diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php
index 6df0f98e7..6756d0758 100644
--- a/database/seeds/VoiceServiceTableSeeder.php
+++ b/database/seeds/VoiceServiceTableSeeder.php
@@ -76,6 +76,16 @@ class VoiceServiceTableSeeder extends Seeder
             'executable' => './murmur.x86',
             'startup' => '-fg'
         ]);
+
+        $this->option['ts3'] = Models\ServiceOptions::create([
+            'parent_service' => $this->service->id,
+            'name' => 'Teamspeak3 Server',
+            'description' => 'VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.',
+            'tag' => 'ts3',
+            'docker_image' => 'quay.io/pterodactyl/voice:ts3',
+            'executable' => './ts3server_minimal_runscript.sh',
+            'startup' => 'default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}}'
+        ]);
     }
 
     private function addVariables()
@@ -93,7 +103,7 @@ class VoiceServiceTableSeeder extends Seeder
         ]);
 
         Models\ServiceVariables::create([
-            'option_id' => $this->option['vanilla']->id,
+            'option_id' => $this->option['mumble']->id,
             'name' => 'Server Version',
             'description' => 'Version of Mumble Server to download and use.',
             'env_variable' => 'MUMBLE_VERSION',
@@ -103,5 +113,17 @@ class VoiceServiceTableSeeder extends Seeder
             'required' => 1,
             'regex' => '/^([0-9_\.-]{5,8})$/'
         ]);
+
+        Models\ServiceVariables::create([
+            'option_id' => $this->option['ts3']->id,
+            'name' => 'Server Version',
+            'description' => 'The version of Teamspeak 3 to use when running the server.',
+            'env_variable' => 'T_VERSION',
+            'default_value' => '3.0.13.4',
+            'user_viewable' => 1,
+            'user_editable' => 1,
+            'required' => 1,
+            'regex' => '/^([0-9_\.-]{5,10})$/'
+        ]);
     }
 }