Fix server and gateway YAML files

basice2e/gateway-1.yaml

basice2e/gateway-2.yaml

basice2e/gateway-3.yaml

basice2e/gateway-4.yaml

basice2e/gateway-5.yaml

basice2e/server-1.yaml

basice2e/server-2.yaml

basice2e/server-3.yaml

basice2e/server-4.yaml

basice2e/server-5.yaml

smokeinfra/gateway-1.yaml

smokeinfra/gateway-2.yaml

smokeinfra/gateway-3.yaml

smokeinfra/server-1.yaml

smokeinfra/server-2.yaml

smokeinfra/server-3.yaml