diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d17ec034e43424c6c264fc7a5a9ee22ba41d6414..342874b0073070bf3711f0e328cb4d39b0ac6b17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: docker:20.10.9
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
-  IMAGE_VER: 0.11.1
+  IMAGE_VER: 0.11.2
 
 services:
   - docker:20.10.9-dind
diff --git a/cf2022.conf b/cf2022.conf
index 52d5eec311b7c8f80076b60d8b69ffba9587dc0f..8743c8ec98c225bb3711ea4f3042e28690b04a45 100644
--- a/cf2022.conf
+++ b/cf2022.conf
@@ -9,8 +9,6 @@
   pretix_event          => 'cf2022',
   pretix_qid_sso        => 29, # identifikator otazky SSO UID
   pretix_qid_region     => 8, # identifikator otazky Kraj
-#  pretix_product_member => 1, # produkt pro cleny
-#  pretix_product_regp   => 2, # produkt pro regp
-  mail_domain => 'pirati.cz',
-  products_map           => {split /\D+/, $ENV{CFG_PRODUCTS_MAP}},
+  pretix_qid_photo      => 28, # identifikator otazky Foto
+  mail_domain           => 'pirati.cz',
 }
diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm
index be36ec1b62751ec5b7b8a208afe9e0fb05fa010c..6217f3aae2ecd3f4e440feb16476f04d05e43076 100644
--- a/lib/CF2022/Controller/Orders.pm
+++ b/lib/CF2022/Controller/Orders.pm
@@ -121,7 +121,7 @@ sub create ($c ) {
         if ( $photo_id ) {
             push @answers, (
                 {
-                    question => 28,
+                    question => $c->config->{pretix_qid_photo} ,
                     answer   => $photo_id,
                 },
             );
diff --git a/lib/CF2022/Helpers/Core.pm b/lib/CF2022/Helpers/Core.pm
index 30a65844fb2b773619e478fb8ac330c7b4824c1e..2ac5d367662e3beea1c49f1507179e88544e850f 100644
--- a/lib/CF2022/Helpers/Core.pm
+++ b/lib/CF2022/Helpers/Core.pm
@@ -71,7 +71,9 @@ sub register ($class, $self, $conf) {
     });
 
     $self->helper(mapped_product_id => sub ($c, $id) {
-        return $c->cfg->{products_map}{$id} // $id;
+        my %map = (split /\D+/, $c->cfg->{pretix_products_map});
+        $c->trace(\%map);
+        return (exists $map{$id}) ? $map{$id} : $id;
     });
 }