diff --git a/avorion.kvp b/avorion.kvp
new file mode 100644
index 0000000..859183d
--- /dev/null
+++ b/avorion.kvp
@@ -0,0 +1,35 @@
+App.AdminMethod=STDIO
+App.ApplicationPort1=27000
+App.ApplicationPort2=27003
+App.ApplicationReadyMode=RegexMatch
+App.BaseDirectory=./avorion/565060/
+App.CommandLineArgs=--galaxy-name {{GALAXYNAME}} --admin {{ADMIN}} --datapath {{GALAXY_PATH}} --max-players {{$MaxUsers}}
+App.CommandLineParameterDelimiter= 
+App.CommandLineParameterFormat=-{0} "{1}"
+App.DisplayName=Avorion
+App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "565060"}
+App.ExecutableLinux=565060//bin/AvorionServer
+App.ExecutableWin=565060\bin\AvorionServer.exe
+App.ExitMethod=String
+App.ExitString=/stop
+App.HasReadableConsole=true
+App.HasWritableConsole=true
+App.RapidStartup=false
+App.RootDir=./avorion/
+App.UpdateSource=Multi
+App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "565060"}]
+App.WorkingDir=565060
+Console.AppReadyRegex=^Server startup complete.$
+Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$
+Console.UserChatRegex=^<(?<username>(?!Server).+?)> (?<message>.+?)$
+Console.UserJoinRegex=^<Server> Player (?<username>.+?) joined the galaxy$
+Console.UserLeaveRegex=^<Server> Player (?<username>.+?) left the galaxy$
+Meta.Author=Shinynecrid
+Meta.ConfigManifest=avorionconfig.json
+Meta.ConfigRoot=avorion.kvp
+Meta.Description=Avorion Dedicated Server
+Meta.DisplayImageSource=steam:445220
+Meta.DisplayName=Avorion
+Meta.EndpointURIFormat=
+Meta.OS=2
+Meta.URL=https://steamdb.info/app/565060/
\ No newline at end of file
diff --git a/avorionconfig.json b/avorionconfig.json
new file mode 100644
index 0000000..b598658
--- /dev/null
+++ b/avorionconfig.json
@@ -0,0 +1,41 @@
+[
+    {
+        "DisplayName": "Galaxy Name",
+        "Category": "Server Configuration",
+        "Description": "Set World Name",
+        "Keywords": "Galaxy",
+        "FieldName": "GALAXYNAME",
+        "InputType": "text",
+        "IsFlagArgument": false,
+        "ParamFieldName": "GALAXYNAME",
+        "IncludeInCommandLine": true,
+        "DefaultValue": "",
+        "EnumValues": {}
+    },
+    {
+        "DisplayName": "Admin",
+        "Category": "Server Configuration",
+        "Description": "Steam64ID for Admin",
+        "Keywords": "Admin",
+        "FieldName": "ADMIN",
+        "InputType": "text",
+        "IsFlagArgument": false,
+        "ParamFieldName": "ADMIN",
+        "IncludeInCommandLine": true,
+        "DefaultValue": "ADMIN",
+        "EnumValues": {}
+    },
+    {
+        "DisplayName": "Max Players",
+        "Category": "Server Configuration",
+        "Description": "Set Max Player Count",
+        "Keywords": "Players",
+        "FieldName": "$MaxUsers",
+        "InputType": "number",
+        "IsFlagArgument": false,
+        "ParamFieldName": "$MaxUsers",
+        "IncludeInCommandLine": true,
+        "DefaultValue": "10",
+        "EnumValues": {}
+    }
+]
\ No newline at end of file