diff --git a/salt/formulas.jinja b/salt/formulas.jinja
index 0c0a50b..2a466a2 100644
--- a/salt/formulas.jinja
+++ b/salt/formulas.jinja
@@ -17,7 +17,8 @@
 {%- macro formulas_roots(env) -%}
 {%- set value = [] -%}
 {%- for dir in formulas.get(env, []) -%}
-{%- do value.append('{0}/{1}'.format(formulas_git_opt(env, 'basedir'), dir)) -%}
+{%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%}
+{%- do value.append('{0}/{1}'.format(basedir, dir)) -%}
 {%- endfor -%}
 {{ value|yaml }}
 {%- endmacro -%}
diff --git a/salt/formulas.sls b/salt/formulas.sls
index 1a40745..5eaaff5 100644
--- a/salt/formulas.sls
+++ b/salt/formulas.sls
@@ -7,7 +7,7 @@
 {% for env, entries in salt['pillar.get']('salt_formulas:list', {}).iteritems() %}
 {% for entry in entries %}
 
-{% set basedir = formulas_git_opt(env, 'basedir') %}
+{% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
 {% set gitdir = '{0}/{1}'.format(basedir, entry) %}
 {% set update = formulas_git_opt(env, 'update')|load_yaml %}
 
@@ -26,9 +26,10 @@
 {% if gitdir not in processed_gitdirs %}
 {% do processed_gitdirs.append(gitdir) %}
 {% set options = formulas_git_opt(env, 'options')|load_yaml %}
+{% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
 {{ gitdir }}:
   git.latest:
-    - name: {{ formulas_git_opt(env, 'baseurl') }}/{{ entry }}.git
+    - name: {{ baseurl }}/{{ entry }}.git
     - target: {{ gitdir }}
     {%- for key, value in options.iteritems() %}
     - {{ key }}: {{ value }}