diff --git a/prow_config.yaml b/prow_config.yaml
index 208355357ed..c1917b7fb25 100644
--- a/prow_config.yaml
+++ b/prow_config.yaml
@@ -47,6 +47,7 @@ workflows:
       - prow_config.yaml
     params:
       registry: 527798164940.dkr.ecr.us-west-2.amazonaws.com
+  # TODO (andreyvelich): Disable until AWS release infra is ready.
   # - app_dir: kubeflow/katib/test/workflows
   #   component: workflows-v1beta1
   #   name: e2e-v1beta1
diff --git a/test/workflows/components/workflows-v1beta1.libsonnet b/test/workflows/components/workflows-v1beta1.libsonnet
index 08125d10cb4..7e0c690c3a8 100644
--- a/test/workflows/components/workflows-v1beta1.libsonnet
+++ b/test/workflows/components/workflows-v1beta1.libsonnet
@@ -75,10 +75,11 @@
           name;
       {
         // Build an Argo template to execute a particular command.
-        // step_name: Name for the template
+        // step_name: Name for the template.
         // command: List to pass as the container command.
         buildTemplate(step_name, image, command):: {
           name: step_name,
+          // Each container can be alive for 40 minutes.
           activeDeadlineSeconds: 2400,
           retryStrategy: {
             limit: 3,
@@ -504,6 +505,7 @@
               "test/scripts/v1beta1/run-e2e-experiment.sh",
               "examples/v1beta1/resume-experiment/from-volume-resume.yaml",
             ]),  // run from volume resume example
+            // TODO (andreyvelich): Temporary disable pr-symlink
             // $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("create-pr-symlink", testWorkerImage, [
             //   "python",
             //   "-m",