diff --git a/bin/cdist-config b/bin/cdist-config
index 36319265..98d8abf7 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -57,6 +57,7 @@ __cdist_version="1.0.0"
 : ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
 : ${__cdist_name_var_object:=__$__cdist_name_object}
 : ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
+: ${__cdist_name_var_type:=__$__cdist_name_type}
 
 
 # Base
diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index 90ecabfc..df4548bf 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -70,6 +70,7 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
             # Make variables available to non-core
             export $__cdist_name_var_object="$__cdist_cur_object_dir"
             export $__cdist_name_var_object_id="$__cdist_object_id"
+            export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
 
             cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
                "$__cdist_new_objects_dir"
diff --git a/conf/type/__issue/manifest b/conf/type/__issue/manifest
index 73df3dee..a4cb703b 100755
--- a/conf/type/__issue/manifest
+++ b/conf/type/__issue/manifest
@@ -24,10 +24,10 @@ os="$(cat "out/explorer/os")"
 
 case "$os" in
    archlinux)
-      source="$(pwd -P)/files/archlinux"
+      source="$__type/files/archlinux"
    ;;
    *)
-      source="$(pwd -P)/files/default"
+      source="$__type/files/default"
    ;;
 esac