diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce83a02eb26ca5ac253e5a410af12db7d1989295..8df4db4e5045434b1191fffa622e5a0a3490544b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,7 @@ deploy:
                               --parameter-overrides "CertificateArn=${CERT_ARN}"
                                                     "DomainName=dev.ordbok.uib.no"
                                                     "AltDomainName=beta.ordbok-dev.aws.uib.no"
+                                                    "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:7"
                               --no-fail-on-empty-changeset
                               --capabilities CAPABILITY_IAM
   - aws s3 rm "s3://${STACK_NAME}.aws.uib.no" --recursive
@@ -71,6 +72,7 @@ deploy-prod:
     - aws cloudformation deploy --stack-name ${STACK_NAME}
                             --template-file "aws/beta.ordbok.uib.no_stack.yaml"
                             --parameter-overrides "CertificateArn=${CERT_ARN}"
+                                                  "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:11"
                             --no-fail-on-empty-changeset
                             --capabilities CAPABILITY_IAM
     - aws s3 rm "s3://${STACK_NAME}.aws.uib.no" --recursive
diff --git a/aws/beta.ordbok.uib.no_stack.yaml b/aws/beta.ordbok.uib.no_stack.yaml
index 3aa4673755b2e86dc3d4f6d8b04f0bea4d8182f6..995d57bd68928d64ac8bb6787d54cabd9d27ada2 100644
--- a/aws/beta.ordbok.uib.no_stack.yaml
+++ b/aws/beta.ordbok.uib.no_stack.yaml
@@ -33,6 +33,9 @@ Parameters:
   CertificateArn:
     Type: String
 
+  PathRewriteLambdaARN:
+    Type: QueryString
+    Description: ARN to lambda function in us-east-1 used to rewrite paths
 
 ###############################################################################
 Resources:
@@ -123,7 +126,7 @@ Resources:
           LambdaFunctionAssociations:
             - EventType: viewer-request
               IncludeBody: false
-              LambdaFunctionARN: !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:path_rewrite"
+              LambdaFunctionARN: !Ref PathRewriteLambdaARN
           ForwardedValues:
             QueryString: 'false'
             Cookies:
@@ -144,7 +147,7 @@ Resources:
             LambdaFunctionAssociations:
               - EventType: viewer-request
                 IncludeBody: false
-                LambdaFunctionARN: !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:path_rewrite"
+                LambdaFunctionARN: !Ref PathRewriteLambdaARN
             ForwardedValues:
               QueryString: true
               Cookies: