diff --git a/modules/rhizo_base/manifests/riak.pp b/modules/rhizo_base/manifests/riak.pp
index 9a16aef..abc37d0 100644
--- a/modules/rhizo_base/manifests/riak.pp
+++ b/modules/rhizo_base/manifests/riak.pp
@@ -48,7 +48,7 @@ class rhizo_base::riak {
         'log.crash.size'                    => '10MB',
         'log.error.file'                    => '$(platform_log_dir)/error.log',
         'log.syslog'                        => 'off',
-        'nodename'                          => "riak@${::fqdn}",
+        'nodename'                          => "riak@${vpn_ip_address}",
         'object.format'                     => '1',
         'object.siblings.maximum'           => '100',
         'object.siblings.warning_threshold' => '25',
@@ -69,4 +69,4 @@ class rhizo_base::riak {
         'storage_backend'                   => 'leveldb',
       }
     }
-  }
\ No newline at end of file
+  }