diff --git a/cmd/jpictl/config.go b/cmd/jpictl/config.go
index a649b53..ec20b7e 100644
--- a/cmd/jpictl/config.go
+++ b/cmd/jpictl/config.go
@@ -14,6 +14,8 @@ var cfg = &Config{
 }
 
 // LoadZones loads all zones and machines in the config directory
-func (cfg *Config) LoadZones() (*zones.Zones, error) {
-	return zones.New(cfg.Base, cfg.Domain)
+func (cfg *Config) LoadZones(resolve bool) (*zones.Zones, error) {
+	return zones.New(cfg.Base, cfg.Domain,
+		zones.ResolvePublicAddresses(resolve),
+	)
 }
diff --git a/cmd/jpictl/dump.go b/cmd/jpictl/dump.go
index eae0801..fb892ba 100644
--- a/cmd/jpictl/dump.go
+++ b/cmd/jpictl/dump.go
@@ -58,7 +58,7 @@ var dumpCmd = &cobra.Command{
 		var buf bytes.Buffer
 		var enc Encoder
 
-		m, err := cfg.LoadZones()
+		m, err := cfg.LoadZones(true)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/jpictl/env.go b/cmd/jpictl/env.go
index 659862a..a968725 100644
--- a/cmd/jpictl/env.go
+++ b/cmd/jpictl/env.go
@@ -11,7 +11,7 @@ var envCmd = &cobra.Command{
 	Use:   "env",
 	Short: "generates environment variables for shell scripts",
 	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := cfg.LoadZones()
+		m, err := cfg.LoadZones(false)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/jpictl/write.go b/cmd/jpictl/write.go
index 93fffb7..acb79c2 100644
--- a/cmd/jpictl/write.go
+++ b/cmd/jpictl/write.go
@@ -9,7 +9,7 @@ var writeCmd = &cobra.Command{
 	Use:   "write",
 	Short: "rewrites all config files",
 	RunE: func(_ *cobra.Command, _ []string) error {
-		m, err := cfg.LoadZones()
+		m, err := cfg.LoadZones(false)
 		if err != nil {
 			return err
 		}