diff --git a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
index 2e7e84a..87d7f06 100644
--- a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
+++ b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
@@ -50,7 +50,7 @@ namespace CodexPlugin
             {
                 // This makes the node announce itself to its public IP address.
                 AddEnvVar("NAT_IP_AUTO", "false");
-                AddEnvVar("NAT_PUBLIC_IP_AUTO", "https://ipinfo.io/ip");
+                AddEnvVar("NAT_PUBLIC_IP_AUTO", PublicIpService.Address);
             }
             else
             {
diff --git a/ProjectPlugins/GethPlugin/GethContainerRecipe.cs b/ProjectPlugins/GethPlugin/GethContainerRecipe.cs
index 564844f..e4c2fe8 100644
--- a/ProjectPlugins/GethPlugin/GethContainerRecipe.cs
+++ b/ProjectPlugins/GethPlugin/GethContainerRecipe.cs
@@ -56,7 +56,7 @@ namespace GethPlugin
             }
             if (config.IsPublicTestNet != null)
             {
-                AddEnvVar("NAT_PUBLIC_IP_AUTO", "https://ipinfo.io/ip");
+                AddEnvVar("NAT_PUBLIC_IP_AUTO", PublicIpService.Address);
             }
 
             return args + $" --authrpc.port {authRpc.Number} --ws --ws.addr 0.0.0.0 --ws.port {wsPort.Number}";