diff --git a/config/config.exs b/config/config.exs
index 62ab0a6..703d7d4 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -3,18 +3,19 @@ import Config
 config :plantid_discord_bot,
   max_results: 5,
   score_threshold: 0.3,
-  plantnet_api_key: System.get_env("PLANTNET_API_KEY"),
-  plantnet_api_base_url: "https://my-api.plantnet.org/v2",
-  port: 4321,
   guild_request_limit_per_day: 20,
   image_path: "priv/static",
-  fileserver_url: "http://localhost:4321",
+  plantnet_api_base_url: "https://my-api.plantnet.org/v2",
   source: "https://github.com/TheRealOwenRees/plantid-discord-bot",
   invite:
     "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot"
 
 config :nostrum,
-  token: System.get_env("PLANTID_DISCORD_BOT_TOKEN"),
   ffmpeg: nil
 
+config :plantid_discord_bot, PlantIdDiscordBot.Scheduler,
+  jobs: [
+    {"@daily", {PlantIdDiscordBot.RateLimiter, :reset_counters, []}}
+  ]
+
 import_config "#{config_env()}.exs"
diff --git a/config/dev.exs b/config/dev.exs
index 7e66272..4fd7ffa 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -1,7 +1,8 @@
 import Config
 
 config :plantid_discord_bot,
-  api: Nostrum.Api
+  api: Nostrum.Api,
+  port: 4321
 
 config :plantid_discord_bot, :environment, :dev
 
diff --git a/config/prod.exs b/config/prod.exs
index 19d5f42..aa8a37c 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -1,14 +1,12 @@
 import Config
 
 config :plantid_discord_bot,
-  api: Nostrum.Api
+  api: Nostrum.Api,
+  port: 4000
 
 config :plantid_discord_bot, :environment, :prod
 
 config :logger,
   backends: [{PlantIdDiscordBot.DiscordLogger, :discord_logger}]
 
-config :logger, :discord_logger,
-  webhook_url: System.get_env("PLANTID_LOGS_DISCORD_WEBHOOK_URL"),
-  level: :error,
-  bot_token: System.get_env("PLANTID_DISCORD_BOT_TOKEN")
+config :logger, :discord_logger, level: :error
diff --git a/config/runtime.exs b/config/runtime.exs
index 05ce478..10f4a02 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -4,23 +4,13 @@ config :plantid_discord_bot,
   start_time: DateTime.utc_now(),
   guild_ids: [],
   api: Nostrum.Api,
-  max_results: 5,
-  score_threshold: 0.3,
   plantnet_api_key: System.get_env("PLANTNET_API_KEY"),
-  plantnet_api_base_url: "https://my-api.plantnet.org/v2",
-  port: 4321,
-  guild_request_limit_per_day: 20,
-  image_path: "priv/static",
-  fileserver_url: "http://localhost:4321",
-  source: "https://github.com/TheRealOwenRees/plantid-discord-bot",
-  invite:
-    "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot"
-
-config :plantid_discord_bot, PlantIdDiscordBot.Scheduler,
-  jobs: [
-    {"@daily", {PlantIdDiscordBot.RateLimiter, :reset_counters, []}}
-  ]
+  fileserver_url: System.get_env("PLANTID_FILESERVER_URL", "http://localhost:4321")
 
 config :nostrum,
-  token: System.get_env("PLANTID_DISCORD_BOT_TOKEN"),
-  ffmpeg: nil
+  token: System.get_env("PLANTID_DISCORD_BOT_TOKEN")
+
+config :logger, :discord_logger,
+  webhook_url: System.get_env("PLANTID_LOGS_DISCORD_WEBHOOK_URL"),
+  level: :error,
+  bot_token: System.get_env("PLANTID_DISCORD_BOT_TOKEN")
diff --git a/config/test.exs b/config/test.exs
index c9087be..1e67483 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -1,7 +1,8 @@
 import Config
 
 config :plantid_discord_bot,
-  api: PlantIdDiscordBotTest.Mocks.Nostrum.Api
+  api: PlantIdDiscordBotTest.Mocks.Nostrum.Api,
+  port: 4321
 
 config :plantid_discord_bot, :environment, :test
 
diff --git a/lib/plantid_discord_bot/cogs/plantnet.ex b/lib/plantid_discord_bot/cogs/plantnet.ex
index 387647d..9db33cd 100644
--- a/lib/plantid_discord_bot/cogs/plantnet.ex
+++ b/lib/plantid_discord_bot/cogs/plantnet.ex
@@ -8,9 +8,7 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do
 
   @api Application.compile_env(:plantid_discord_bot, :api)
   @plantnet_api_base_url Application.compile_env(:plantid_discord_bot, :plantnet_api_base_url)
-  @plantnet_api_key Application.compile_env(:plantid_discord_bot, :plantnet_api_key)
   @max_results Application.compile_env(:plantid_discord_bot, :max_results)
-  @fileserver_url Application.compile_env(:plantid_discord_bot, :fileserver_url)
 
   @doc """
   Process /id application command.
@@ -77,19 +75,17 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do
         PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
 
       _ ->
-        Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end)
+        Enum.map(saved_images, fn {:ok, filename} ->
+          "#{Application.get_env(:plantid_discord_bot, :fileserver_url)}/#{filename}"
+        end)
     end
-
-    # if Mix.env() in [:test, :dev] do
-    #   PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
-    # else
-    #   Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end)
-    # end
   end
 
   @spec build_query_uri([String.t()]) :: String.t()
   defp build_query_uri(image_filenames) do
-    URI.parse("#{@plantnet_api_base_url}/identify/all?api-key=#{@plantnet_api_key}")
+    URI.parse(
+      "#{@plantnet_api_base_url}/identify/all?api-key=#{Application.get_env(:plantid_discord_bot, :plantnet_api_key)}"
+    )
     |> URI.append_query("images=#{Enum.join(image_filenames, "&images=")}")
     |> URI.append_query("nb-results=#{@max_results}")
     |> URI.append_query("type=kt")