diff --git a/defaults/main.yml b/defaults/main.yml
index 60a753f..50eb08f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,8 +15,12 @@ minio_group: minio
 # Path to the file containing the ENV variables for the Minio server
 minio_server_envfile: /etc/default/minio
 
+# Minio server ip/fqdn and port. This makes up the server_addr below
+minio_server_ip: ""
+minio_server_port: "9091"
+
 # Minio server listen address
-minio_server_addr: ":9091"
+minio_server_addr: "{{ minio_server_ip }}:{{ minio_server_port}}"
 
 # Minio server data directories
 minio_server_datadirs:
@@ -32,9 +36,9 @@ minio_server_env_extra: ""
 # Additional Minio server CLI options
 minio_server_opts: ""
 
-# Minio access and secret keys
-minio_access_key: ""
-minio_secret_key: ""
+# Minio root user credentials
+minio_root_user: ""
+minio_root_password: ""
 
 # Switches to enable/disable the Minio server and/or Minio client installation.
 minio_install_server: true
diff --git a/templates/minio.env.j2 b/templates/minio.env.j2
index 84723fc..17aa5c6 100644
--- a/templates/minio.env.j2
+++ b/templates/minio.env.j2
@@ -9,13 +9,13 @@ MINIO_VOLUMES="{{ minio_server_datadirs | join(' ') }}"
 # Minio cli options.
 MINIO_OPTS="--address {{ minio_server_addr }} {{ minio_server_opts }}"
 
-{% if minio_access_key %}
-# Access Key of the server.
-MINIO_ACCESS_KEY="{{ minio_access_key }}"
+{% if minio_root_user %}
+# Root User of the server.
+MINIO_ROOT_USER="{{ minio_root_user }}"
 {% endif %}
-{% if minio_secret_key %}
-# Secret key of the server.
-MINIO_SECRET_KEY="{{ minio_secret_key }}"
+{% if minio_root_password %}
+# Root Password of the server.
+MINIO_ROOT_PASSWORD="{{ minio_root_password }}"
 {% endif %}
 
 {{ minio_server_env_extra }}