diff --git a/agora-specs/Sample/Governor/Initialize.hs b/agora-specs/Sample/Governor/Initialize.hs
index 1a2a6d7..e365f9b 100644
--- a/agora-specs/Sample/Governor/Initialize.hs
+++ b/agora-specs/Sample/Governor/Initialize.hs
@@ -121,7 +121,7 @@ scripts :: Map Text Script
 scripts =
   either
     (error . show)
-    (view #scripts)
+    (fmap (view #script) . view #scripts)
     ( runLinker
         linker
         (agoraScripts deterministicTracingConfing)
diff --git a/agora-specs/Sample/Shared.hs b/agora-specs/Sample/Shared.hs
index b2ac27f..9737f46 100644
--- a/agora-specs/Sample/Shared.hs
+++ b/agora-specs/Sample/Shared.hs
@@ -141,7 +141,7 @@ agoraScripts :: Map Text Script
 agoraScripts =
   either
     (error . show)
-    (view #scripts)
+    (fmap (view #script) . view #scripts)
     ( runLinker
         linker
         (Bootstrap.agoraScripts deterministicTracingConfing)
diff --git a/agora/Agora/Linker.hs b/agora/Agora/Linker.hs
index 1db1a43..dbd30cf 100644
--- a/agora/Agora/Linker.hs
+++ b/agora/Agora/Linker.hs
@@ -13,7 +13,6 @@ import PlutusLedgerApi.V1 (Address, CurrencySymbol, TxOutRef, ValidatorHash)
 import Ply (
   ScriptRole (MintingPolicyRole, ValidatorRole),
   toMintingPolicy,
-  toScript,
   toValidator,
   (#),
  )
@@ -22,6 +21,7 @@ import ScriptExport.ScriptInfo (
   ScriptExport (..),
   fetchTS,
   getParam,
+  toRoledScript,
  )
 import Prelude hiding ((#))
 
@@ -108,17 +108,17 @@ linker = do
     ScriptExport
       { scripts =
           fromList
-            [ ("agora:governorPolicy", toScript govPol')
-            , ("agora:governorValidator", toScript govVal')
-            , ("agora:stakePolicy", toScript stakPol')
-            , ("agora:stakeValidator", toScript stakVal')
-            , ("agora:proposalPolicy", toScript propPol')
-            , ("agora:proposalValidator", toScript propVal')
-            , ("agora:treasuryValidator", toScript treaVal')
-            , ("agora:authorityTokenPolicy", toScript atPol')
-            , ("agora:noOpValidator", toScript noOpVal')
-            , ("agora:treasuryWithdrawalValidator", toScript treaWithdrawalVal')
-            , ("agora:mutateGovernorValidator", toScript mutateGovVal')
+            [ ("agora:governorPolicy", toRoledScript govPol')
+            , ("agora:governorValidator", toRoledScript govVal')
+            , ("agora:stakePolicy", toRoledScript stakPol')
+            , ("agora:stakeValidator", toRoledScript stakVal')
+            , ("agora:proposalPolicy", toRoledScript propPol')
+            , ("agora:proposalValidator", toRoledScript propVal')
+            , ("agora:treasuryValidator", toRoledScript treaVal')
+            , ("agora:authorityTokenPolicy", toRoledScript atPol')
+            , ("agora:noOpValidator", toRoledScript noOpVal')
+            , ("agora:treasuryWithdrawalValidator", toRoledScript treaWithdrawalVal')
+            , ("agora:mutateGovernorValidator", toRoledScript mutateGovVal')
             ]
       , information =
           AgoraScriptInfo
diff --git a/flake.lock b/flake.lock
index 12c0bce..579241a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -743,11 +743,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666051771,
-        "narHash": "sha256-gWNP538VYPGSABTMiditBSfyNH1mOc4mekINTzYz5Hk=",
+        "lastModified": 1667498866,
+        "narHash": "sha256-rzP1HxKacT7hz4YzJ4LTxh+TEZyzrtCgPRbXzJHSv28=",
         "owner": "Liqwid-Labs",
         "repo": "liqwid-script-export",
-        "rev": "17e8aad4bcea21478ed22e08b0ccbc4a65079d7a",
+        "rev": "fd8bd015741137ad206c8c8bbca0428da5a13504",
         "type": "github"
       },
       "original": {