diff --git a/MongooseIM/configs/vm.args b/MongooseIM/configs/vm.args
index 1d2158f..db40af4 100644
--- a/MongooseIM/configs/vm.args
+++ b/MongooseIM/configs/vm.args
@@ -18,3 +18,9 @@
 
 -kernel inet_dist_listen_min 9100
 -kernel inet_dist_listen_max 9100
+
+## Use a custom Erlang Port Mapper (EPMD) module
+## This module uses RDBMS and CETS to resolve node IP addresses
+{{ if and (eq "cets" .Values.volatileDatabase) (eq "rdbms" .Values.persistentDatabase) -}}
+-epmd_module mongoose_epmd
+{{ end -}}
diff --git a/MongooseIM/templates/mongoose-sts.yaml b/MongooseIM/templates/mongoose-sts.yaml
index aa3b0d9..907ea73 100644
--- a/MongooseIM/templates/mongoose-sts.yaml
+++ b/MongooseIM/templates/mongoose-sts.yaml
@@ -42,6 +42,10 @@ spec:
             value: "name"
           - name: NODE_NAME
             value: {{ .Values.nodeName }}
+          - name: MIM_NODE_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.podIP
         ports:
         - name: epmd
           containerPort: 4369
diff --git a/MongooseIM/templates/mongoose-svc.yaml b/MongooseIM/templates/mongoose-svc.yaml
index 100e817..09bc395 100644
--- a/MongooseIM/templates/mongoose-svc.yaml
+++ b/MongooseIM/templates/mongoose-svc.yaml
@@ -33,6 +33,8 @@ spec:
   - name: gql-user
     port: 5561
     targetPort: 5561
+  # Headless service
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     app: mongooseim