diff --git a/config.php b/config.php
index 35dead0..f0888b0 100644
--- a/config.php
+++ b/config.php
@@ -1,6 +1,15 @@
 <?php
 
 define('IRMA_SERVER_URL', 'http://localhost:8088');
-define('BASE_URL', 'https://privacybydesign.foundation');
-define('IRMATUBE_NEXT_SESSION_URL', BASE_URL . '/demo/get_session_request.php');
 define('API_TOKEN', '');
+define('DEMO', false);
+
+if (DEMO) {
+    define('ISSUER', 'irma-demo');
+    define('BASE_URL', 'http://localhost');
+    define('IRMATUBE_NEXT_SESSION_URL', BASE_URL . '/build/nl/get_session_request.php');
+} else {
+    define('ISSUER', 'pbdf');
+    define('BASE_URL', 'https://privacybydesign.foundation');
+    define('IRMATUBE_NEXT_SESSION_URL', BASE_URL . '/demo/get_session_request.php');
+}
\ No newline at end of file
diff --git a/get_session_request.php b/get_session_request.php
index 1f49958..56c0334 100644
--- a/get_session_request.php
+++ b/get_session_request.php
@@ -11,7 +11,7 @@ function get_session_request($contents) {
     $sessionrequest = [
         '@context' => 'https://irma.app/ld/request/issuance/v2',
         'credentials' => [[
-            'credential' => 'irma-demo.IRMATube.member',
+            'credential' => ISSUER . '.IRMATube.member',
             'validity' => strtotime('+6 months'),
             'attributes' => [
                 'fullname' => $parsedjson['disclosed'][0][0]['rawvalue'],
diff --git a/start_session.php b/start_session.php
index ea2f7ff..a0d5ec9 100644
--- a/start_session.php
+++ b/start_session.php
@@ -134,8 +134,8 @@
             '@context' => 'https://irma.app/ld/request/disclosure/v2',
             'disclose' => [
                 [
-                    ['pbdf.pbdf.facebook.fullname'],
-                    ['pbdf.gemeente.personalData.fullname'],
+                    [ISSUER .'.pbdf.facebook.fullname'],
+                    [ISSUER .'.gemeente.personalData.fullname'],
                 ]
             ],
         ]
@@ -143,7 +143,7 @@
     'watch_premium_contents' => [
         '@context' => 'https://irma.app/ld/request/disclosure/v2',
         'disclose' => [[[
-            'pbdf.IRMATube.member.fullname',
+            ISSUER .'.IRMATube.member.fullname',
         ]]],
     ],
     'presencecheck' => [