diff --git a/metadata/service/server/local.yml b/metadata/service/server/local.yml
index 9bea8a6..c23dac0 100644
--- a/metadata/service/server/local.yml
+++ b/metadata/service/server/local.yml
@@ -4,6 +4,7 @@
   redis:
     server:
       enabled: true
+      version: 2.8
       bind:
         address: 127.0.0.1
         port: 6379
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 100c5f6..bd64b14 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -4,6 +4,7 @@
   redis:
     server:
       enabled: true
+      version: 2.8
       bind:
         address: 0.0.0.0
         port: 6379
diff --git a/redis/files/redis.conf.2.2 b/redis/files/2.2/redis.conf
similarity index 100%
rename from redis/files/redis.conf.2.2
rename to redis/files/2.2/redis.conf
diff --git a/redis/files/redis.conf.2.8 b/redis/files/2.8/redis.conf
similarity index 100%
rename from redis/files/redis.conf.2.8
rename to redis/files/2.8/redis.conf
diff --git a/redis/server.sls b/redis/server.sls
index 57c3aa1..3291ea6 100755
--- a/redis/server.sls
+++ b/redis/server.sls
@@ -10,15 +10,9 @@
   sysctl.present:
     - value: 1
 
-{% if (grains.os == 'Ubuntu' and grains.osrelease > '13.10') or grains.os_family == 'Arch' %}
-{% set conf_file_source = 'salt://redis/files/redis.conf.2.8' %}
-{% else %}
-{% set conf_file_source = 'salt://redis/files/redis.conf.2.2' %}
-{% endif %}
-
 {{ server.conf_dir }}:
   file.managed:
-  - source: {{ conf_file_source }}
+  - source: salt://redis/files/{{ server.version }}/redis.conf
   - template: jinja
   - user: root
   - group: root