modified ci-fw-rules and dev-fw-rules